summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-09-10 16:36:44 +0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-16 13:36:21 +0100
commita40fcab604554d0e549294458b27b25e5639fceb (patch)
treed414975e1719cec6138d21de67c1222136518245
parent138f44f9bbd37fc86596a14a2b541597eee27ae4 (diff)
downloadmeta-openembedded-a40fcab604554d0e549294458b27b25e5639fceb.tar.gz
apache2: create configuration file for systemd-tmpfiles
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>
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb8
-rw-r--r--meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf2
2 files changed, 9 insertions, 1 deletions
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 f230f9407..6b461f337 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 \
16 file://replace-lynx-to-curl-in-apachectl-script.patch \ 16 file://replace-lynx-to-curl-in-apachectl-script.patch \
17 file://apache-ssl-ltmain-rpath.patch \ 17 file://apache-ssl-ltmain-rpath.patch \
18 file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \ 18 file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \
19 file://init" 19 file://init \
20 file://apache2-volatile.conf"
20 21
21LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" 22LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
22SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe" 23SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe"
@@ -70,6 +71,11 @@ do_install_append() {
70 printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf 71 printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
71 # match with that is in init script 72 # match with that is in init script
72 printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf 73 printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
74
75 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
76 install -d ${D}${sysconfdir}/tmpfiles.d/
77 install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
78 fi
73} 79}
74 80
75SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" 81SYSROOT_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 000000000..ff2c58704
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
@@ -0,0 +1,2 @@
1d /var/run/apache2 0755 root root -
2d /var/log/apache2 0755 root root -