From 2630b26862a64f32f81fd455df31270125ea5487 Mon Sep 17 00:00:00 2001 From: "dengke.du@windriver.com" Date: Thu, 14 Sep 2017 23:18:20 -0400 Subject: apache2: use volatiles for sysvinit Signed-off-by: Dengke Du Signed-off-by: Martin Jansa --- meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 4 ++++ meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 (limited to 'meta-webserver') 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 f053e37f9b..c7e7b54c62 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 \ file://init \ file://apache2-volatile.conf \ file://apache2.service \ + file://volatiles.04_apache2 \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" @@ -90,6 +91,9 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi 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 0000000000..922075b1bd --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 @@ -0,0 +1,3 @@ +# +d root root 0755 /var/run/apache2 none +d root root 0755 /var/log/apache2 none -- cgit 1.2.3-korg