diff options
| author |   Riku Voipio <riku.voipio@linaro.org> | 2013-07-22 17:04:54 +0300 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-26 10:06:01 +0100 |
| commit | 16fad8e6191fddd372e0791e0b6f3d541ce3b738 (patch) | |
| tree | a1c1a590c20e35e0ebbb54d54174ad72afa93c83 /meta-webserver/recipes-httpd | |
| parent | 02adda55bbb151b540ae00d57618ae6ac2b348f7 (diff) | |
| download | meta-openembedded-contrib-16fad8e6191fddd372e0791e0b6f3d541ce3b738.tar.gz | |
apache2: move pidfile to run
pidile was stored in /var/apache2/log which is saved over boots.
This might prevent startup of apache2 on boots. Move it to /run
where pidfiles in general belong.
Diffstat (limited to 'meta-webserver/recipes-httpd')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 2 | ||||
| -rwxr-xr-x | meta-webserver/recipes-httpd/apache2/files/init | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb index cf1e4690e8..8c9416a921 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb @@ -68,6 +68,8 @@ do_install_append() { # Ensure configuration file pulls in conf.d and modules.d printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf 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 } SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" diff --git a/meta-webserver/recipes-httpd/apache2/files/init b/meta-webserver/recipes-httpd/apache2/files/init index 346dc0d52f..a1adbd74f9 100755 --- a/meta-webserver/recipes-httpd/apache2/files/init +++ b/meta-webserver/recipes-httpd/apache2/files/init @@ -14,7 +14,7 @@ NAME=apache2 PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/httpd SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/apache2/logs/httpd.pid +PIDFILE=/run/httpd.pid CONF=/etc/apache2/httpd.conf APACHECTL=/usr/sbin/apachectl |