diff options
Diffstat (limited to 'meta-webserver')
| -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() { | |||
| 68 | # Ensure configuration file pulls in conf.d and modules.d | 68 | # Ensure configuration file pulls in conf.d and modules.d |
| 69 | printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf | 69 | printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf |
| 70 | printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf | 70 | printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf |
| 71 | # match with that is in init script | ||
| 72 | printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf | ||
| 71 | } | 73 | } |
| 72 | 74 | ||
| 73 | SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" | 75 | 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 | |||
| 14 | PATH=/bin:/usr/bin:/sbin:/usr/sbin | 14 | PATH=/bin:/usr/bin:/sbin:/usr/sbin |
| 15 | DAEMON=/usr/sbin/httpd | 15 | DAEMON=/usr/sbin/httpd |
| 16 | SUEXEC=/usr/lib/apache/suexec | 16 | SUEXEC=/usr/lib/apache/suexec |
| 17 | PIDFILE=/var/apache2/logs/httpd.pid | 17 | PIDFILE=/run/httpd.pid |
| 18 | CONF=/etc/apache2/httpd.conf | 18 | CONF=/etc/apache2/httpd.conf |
| 19 | APACHECTL=/usr/sbin/apachectl | 19 | APACHECTL=/usr/sbin/apachectl |
| 20 | 20 | ||
