From 5f7487f6762c0ea4b34369f2f70f5b4866a08cab Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 4 Sep 2017 12:58:17 +0100 Subject: [PATCH] core114: Ship updated apache2 Signed-off-by: Michael Tremer --- config/rootfiles/core/114/filelists/apache2 | 1 + config/rootfiles/core/114/filelists/apr | 1 + config/rootfiles/core/114/filelists/aprutil | 1 + config/rootfiles/core/114/update.sh | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 config/rootfiles/core/114/filelists/apache2 create mode 120000 config/rootfiles/core/114/filelists/apr create mode 120000 config/rootfiles/core/114/filelists/aprutil diff --git a/config/rootfiles/core/114/filelists/apache2 b/config/rootfiles/core/114/filelists/apache2 new file mode 120000 index 0000000000..eef95efa72 --- /dev/null +++ b/config/rootfiles/core/114/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/114/filelists/apr b/config/rootfiles/core/114/filelists/apr new file mode 120000 index 0000000000..87dd1974f2 --- /dev/null +++ b/config/rootfiles/core/114/filelists/apr @@ -0,0 +1 @@ +../../../common/apr \ No newline at end of file diff --git a/config/rootfiles/core/114/filelists/aprutil b/config/rootfiles/core/114/filelists/aprutil new file mode 120000 index 0000000000..999f9f84bc --- /dev/null +++ b/config/rootfiles/core/114/filelists/aprutil @@ -0,0 +1 @@ +../../../common/aprutil \ No newline at end of file diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh index 54a2062304..77cf1f8f47 100644 --- a/config/rootfiles/core/114/update.sh +++ b/config/rootfiles/core/114/update.sh @@ -35,6 +35,7 @@ done ipsec stop /etc/init.d/squid stop /etc/init.d/unbound stop +/etc/init.d/apache stop # Extract files extract_files @@ -42,13 +43,15 @@ extract_files # update linker config ldconfig -# Remove baudrate from inittab +# Remove some files +rm -f /usr/sbin/htpasswd # Update Language cache /usr/local/bin/update-lang-cache # Start services /etc/init.d/unbound start +/etc/init.d/apache start /etc/init.d/squid start if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then -- 2.39.5