From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Feb 2018 12:41:05 +0000 (+0000)
Subject: core120: Remove forgotten PHP file
X-Git-Tag: v2.19-core120~78
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c8e4391eccf6cff06b7ee17d1a50912fe77faf32

core120: Remove forgotten PHP file

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

diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index c9bbd47232..aeff326748 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -31,6 +31,9 @@ for (( i=1; i<=$core; i++ )); do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Remove forgotten PHP file
+rm -f /etc/httpd/conf/conf.d/php5.conf
+
 # Stop services
 
 # Extract files