CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache2: fix configuration

Browse Source 
* 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>
This commit is contained in:
Paul Eggleton 2012-10-07 11:51:22 +01:00 committed by Koen Kooi
parent cbac8756e8
commit 6d182b316f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
View File

@ -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"

6
meta-webserver/recipes-httpd/apache2/files/init
View File

@ -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)