From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Jul 2018 13:46:53 +0000 (+0100)
Subject: core123: Ship and restart squid and apache
X-Git-Tag: v2.21-core123~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a580a31c0ff5c596027b4e942869e4e7342f2de6;p=ipfire-2.x.git

core123: Ship and restart squid and apache

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

diff --git a/config/rootfiles/core/123/filelists/apache2 b/config/rootfiles/core/123/filelists/apache2
new file mode 120000
index 0000000000..eef95efa72
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/core/123/filelists/squid
new file mode 120000
index 0000000000..2dc8372a0e
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
index ee8a5ec0b7..cf488ec49e 100644
--- a/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/core/123/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/init.d/squid stop
 
 # Extract files
 extract_files
@@ -46,7 +47,9 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
+/etc/init.d/apache restart
 /etc/init.d/unbound restart
+/etc/init.d/squid start
 
 # This update needs a reboot...
 touch /var/run/need_reboot