aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-07 11:51:22 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-09 11:09:23 +0200
commit6d182b316f366e3491ee50ccd021eb7a79189136 (patch)
tree3c159cb0ac7b4d3dab2cc9c06b361d7239dd6c25 /meta-webserver/recipes-httpd/apache2
parentcbac8756e815c3f141cebf6d2e6875400980a4f9 (diff)
downloadmeta-openembedded-6d182b316f366e3491ee50ccd021eb7a79189136.tar.gz
apache2: fix configuration
* Include conf files in /etc/apache2/modules.d and conf.d * Add -D PHP5 to options so that PHP is enabled if installed * Fix "reload" action in initscript Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb10
-rwxr-xr-xmeta-webserver/recipes-httpd/apache2/files/init6
2 files changed, 10 insertions, 6 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
index 15c4d024fe..0eb53275c8 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
RDEPENDS_${PN} += "openssl libgcc"
SECTION = "net"
LICENSE = "Apache-2.0"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
file://server-makefile.patch \
@@ -68,8 +68,12 @@ do_install_append() {
# Expat should be found in the staging area via DEPENDS...
rm -f ${D}/${libdir}/libexpat.*
- # Ensure configuration file pulls in modules.d
- printf "\nInclude ${sysconfdir}/${PN}/modules.d/*\n\n" >> ${D}/${sysconfdir}/${PN}/httpd.conf
+ install -d ${D}${sysconfdir}/${PN}/conf.d
+ install -d ${D}${sysconfdir}/${PN}/modules.d
+
+ # Ensure configuration file pulls in conf.d and modules.d
+ printf "\nIncludeOptional ${sysconfdir}/${PN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${PN}/httpd.conf
+ printf "\nIncludeOptional ${sysconfdir}/${PN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${PN}/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 85af742836..346dc0d52f 100755
--- a/meta-webserver/recipes-httpd/apache2/files/init
+++ b/meta-webserver/recipes-httpd/apache2/files/init
@@ -9,12 +9,12 @@
# implementing the current HTTP standards.
### END INIT INFO
-ARGS="-D SSL -k start"
+ARGS="-D SSL -D PHP5 -k start"
NAME=apache2
PATH=/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/usr/sbin/httpd
SUEXEC=/usr/lib/apache/suexec
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/apache2/logs/httpd.pid
CONF=/etc/apache2/httpd.conf
APACHECTL=/usr/sbin/apachectl
@@ -40,7 +40,7 @@ case "$1" in
reload)
echo -n "Reloading $NAME configuration"
- $APACHECTL reload
+ kill -HUP `cat $PIDFILE`
;;
reload-modules)