diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-07 11:51:22 +0100 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-10-09 11:09:23 +0200 |
| commit | 6d182b316f366e3491ee50ccd021eb7a79189136 (patch) | |
| tree | 3c159cb0ac7b4d3dab2cc9c06b361d7239dd6c25 /meta-webserver/recipes-httpd/apache2/files | |
| parent | cbac8756e815c3f141cebf6d2e6875400980a4f9 (diff) | |
| download | meta-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/files')
| -rwxr-xr-x | meta-webserver/recipes-httpd/apache2/files/init | 6 |
1 files changed, 3 insertions, 3 deletions
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) |