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