From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Jan 2018 13:41:32 +0000 (+0000)
Subject: core118: Restart apache to drop PHP module
X-Git-Tag: v2.19-core118~3^2~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66b2fabd4031de1cae9045c810756a1333ef976c;p=ipfire-2.x.git

core118: Restart apache to drop PHP module

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index 34061a38a2..cbc59893fd 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+etc/httpd/conf/loadmodule.conf
 etc/httpd/conf/vhosts.d/captive.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/httpd/conf/vhosts.d/ipfire-interface.conf
diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/core/118/update.sh
index e04f047837..b3e57f44d4 100644
--- a/config/rootfiles/core/118/update.sh
+++ b/config/rootfiles/core/118/update.sh
@@ -31,6 +31,9 @@ for (( i=1; i<=$core; i++ )); do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Delete files
+rm -vf /etc/httpd/conf.d/php5.conf
+
 # Stop services
 
 # Extract files
@@ -43,7 +46,7 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
-/etc/init.d/apache reload
+/etc/init.d/apache restart
 
 # This update need a reboot...
 #touch /var/run/need_reboot