Patchwork [meta-webserver] apache2: create configuration file for systemd-tmpfiles

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Sept. 10, 2013, 8:36 a.m.
Message ID <1378802204-14737-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/57739/
State Accepted, archived
Commit a40fcab604554d0e549294458b27b25e5639fceb
Headers show

Comments

rongqing.li@windriver.com - Sept. 10, 2013, 8:36 a.m.
From: Roy Li <rongqing.li@windriver.com>

when use systemd as a system and service manager, systemd-tmpfiles will replace
/etc/init.d/populate-volatile.sh to handle temporary files, so we need to create
the configuration file for apache2

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb          |    8 +++++++-
 .../recipes-httpd/apache2/files/apache2-volatile.conf          |    2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf

Patch

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb
index fa14b07..fc7452f 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb
@@ -16,7 +16,8 @@  SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
            file://replace-lynx-to-curl-in-apachectl-script.patch \
            file://apache-ssl-ltmain-rpath.patch \
            file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \
-           file://init"
+           file://init \
+           file://apache2-volatile.conf"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
 SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe"
@@ -72,6 +73,11 @@  do_install_append() {
     printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
     # match with that is in init script
     printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+
+    if ${@base_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/
+    fi
 }
 
 SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
new file mode 100644
index 0000000..ff2c587
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
@@ -0,0 +1,2 @@ 
+d  /var/run/apache2 0755 root root -
+d  /var/log/apache2 0755 root root -