diff options
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 4 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb index f053e37f9..c7e7b54c6 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | |||
@@ -20,6 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ | |||
20 | file://init \ | 20 | file://init \ |
21 | file://apache2-volatile.conf \ | 21 | file://apache2-volatile.conf \ |
22 | file://apache2.service \ | 22 | file://apache2.service \ |
23 | file://volatiles.04_apache2 \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" | 26 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" |
@@ -90,6 +91,9 @@ do_install_append() { | |||
90 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 91 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
91 | install -d ${D}${sysconfdir}/tmpfiles.d/ | 92 | install -d ${D}${sysconfdir}/tmpfiles.d/ |
92 | install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ | 93 | install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ |
94 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | ||
95 | install -d ${D}${sysconfdir}/default/volatiles | ||
96 | install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 | ||
93 | fi | 97 | fi |
94 | 98 | ||
95 | install -d ${D}${systemd_unitdir}/system | 99 | install -d ${D}${systemd_unitdir}/system |
diff --git a/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 new file mode 100644 index 000000000..922075b1b --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 | |||
@@ -0,0 +1,3 @@ | |||
1 | # <type> <owner> <group> <mode> <path> <linksource> | ||
2 | d root root 0755 /var/run/apache2 none | ||
3 | d root root 0755 /var/log/apache2 none | ||