summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb2
-rwxr-xr-xmeta-webserver/recipes-httpd/apache2/files/init2
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 cf1e4690e..8c9416a92 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
73SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" 75SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
diff --git a/meta-webserver/recipes-httpd/apache2/files/init b/meta-webserver/recipes-httpd/apache2/files/init
index 346dc0d52..a1adbd74f 100755
--- a/meta-webserver/recipes-httpd/apache2/files/init
+++ b/meta-webserver/recipes-httpd/apache2/files/init
@@ -14,7 +14,7 @@ NAME=apache2
14PATH=/bin:/usr/bin:/sbin:/usr/sbin 14PATH=/bin:/usr/bin:/sbin:/usr/sbin
15DAEMON=/usr/sbin/httpd 15DAEMON=/usr/sbin/httpd
16SUEXEC=/usr/lib/apache/suexec 16SUEXEC=/usr/lib/apache/suexec
17PIDFILE=/var/apache2/logs/httpd.pid 17PIDFILE=/run/httpd.pid
18CONF=/etc/apache2/httpd.conf 18CONF=/etc/apache2/httpd.conf
19APACHECTL=/usr/sbin/apachectl 19APACHECTL=/usr/sbin/apachectl
20 20