From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 4 Apr 2019 01:04:28 +0000 (+0100)
Subject: core130: Ship updated apache
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=af9aa1556e6329e7af3d8939c51316fe1599295a

core130: Ship updated apache

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

diff --git a/config/rootfiles/core/130/filelists/apache2 b/config/rootfiles/core/130/filelists/apache2
new file mode 120000
index 0000000000..eef95efa72
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh
index f072e80528..86e42a1d4e 100644
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@ -32,15 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
-/etc/init.d/squid stop
-/usr/local/bin/openvpnctrl -k
-/usr/local/bin/openvpnctrl -kn2n
 /usr/local/bin/ipsecctrl D
-/etc/init.d/unbound stop
-
-# Remove files
-rm -vf \
-	/usr/lib/firewall/ipsec-block
 
 # Extract files
 extract_files
@@ -52,12 +44,8 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
-/etc/init.d/firewall restart
-/etc/init.d/unbound start
+/etc/init.d/apache restart
 /usr/local/bin/ipsecctrl S
-/usr/local/bin/openvpnctrl -s
-/usr/local/bin/openvpnctrl -sn2n
-/etc/init.d/squid start
 
 # This update needs a reboot...
 #touch /var/run/need_reboot