aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd
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 /meta-webserver/recipes-httpd
parent138f44f9bbd37fc86596a14a2b541597eee27ae4 (diff)
downloadmeta-openembedded-contrib-a40fcab604554d0e549294458b27b25e5639fceb.tar.gz
meta-openembedded-contrib-a40fcab604554d0e549294458b27b25e5639fceb.tar.bz2
meta-openembedded-contrib-a40fcab604554d0e549294458b27b25e5639fceb.zip
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>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-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 f230f94070..6b461f3374 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"
@@ -70,6 +71,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 0000000000..ff2c587046
--- /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 -