Patchwork [meta-webserver] apache2: move pidfile to run

login
register
mail settings
Submitter Riku Voipio
Date July 22, 2013, 2:04 p.m.
Message ID <1374501894-17068-1-git-send-email-riku.voipio@linaro.org>
Download mbox | patch
Permalink /patch/54183/
State Accepted, archived
Commit 16fad8e6191fddd372e0791e0b6f3d541ce3b738
Headers show

Comments

Riku Voipio - July 22, 2013, 2:04 p.m.
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.
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 2 ++
 meta-webserver/recipes-httpd/apache2/files/init       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
Riku Voipio - July 26, 2013, 8:30 a.m.
ping?

On 22 July 2013 17:04, Riku Voipio <riku.voipio@linaro.org> wrote:
> 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.
> ---
>  meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 2 ++
>  meta-webserver/recipes-httpd/apache2/files/init       | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> 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 cf1e469..8c9416a 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 346dc0d..a1adbd7 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
>
> --
> 1.8.3.1
>
Paul Eggleton - July 26, 2013, 9:08 a.m.
Hi Riku,

On Friday 26 July 2013 11:30:34 Riku Voipio wrote:
> On 22 July 2013 17:04, Riku Voipio <riku.voipio@linaro.org> wrote:
> > 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.
> >...
> ping?

Merged to master, thanks.

Cheers,
Paul

Patch

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 cf1e469..8c9416a 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 346dc0d..a1adbd7 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