From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 4 Sep 2017 12:09:43 +0000 (+0100)
Subject: core114: Update apache configuration of all add-ons that have one
X-Git-Tag: v2.19-core114~1^2~10
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a0410549418a4dd2d6ae1f71728da1eae7a928a3

core114: Update apache configuration of all add-ons that have one

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

diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh
index 77cf1f8f47..6d7a10b5ed 100644
--- a/config/rootfiles/core/114/update.sh
+++ b/config/rootfiles/core/114/update.sh
@@ -37,6 +37,17 @@ ipsec stop
 /etc/init.d/unbound stop
 /etc/init.d/apache stop
 
+# Remove old apache configuration files of add-ons
+# These will be reinstalled by the updated packages
+# as soon as the core update is finished.
+rm -f \
+	/etc/httpd/conf/vhosts.d/cacti.conf \
+	/etc/httpd/conf/vhosts.d/icinga.conf \
+	/etc/httpd/conf/vhosts.d/nagios.conf \
+	/etc/httpd/conf/vhosts.d/openmailadmin.conf \
+	/etc/httpd/conf/vhosts.d/owncloud.conf \
+	/etc/httpd/conf/vhosts.d/phpSANE.conf
+
 # Extract files
 extract_files
 
diff --git a/lfs/cacti b/lfs/cacti
index f44e7b40eb..d0e967d229 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "netsnmpd mysql"
 
diff --git a/lfs/icinga b/lfs/icinga
index ab562f24c9..5d8d5a16f6 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
diff --git a/lfs/nagios b/lfs/nagios
index 1a88989d7c..5ff1499a85 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "traceroute"
 
diff --git a/lfs/openmailadmin b/lfs/openmailadmin
index 147595d162..1980be70c9 100644
--- a/lfs/openmailadmin
+++ b/lfs/openmailadmin
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openmailadmin
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "cyrus-imapd postfix mysql"
 
diff --git a/lfs/owncloud b/lfs/owncloud
index e021a4c63a..c13e296783 100644
--- a/lfs/owncloud
+++ b/lfs/owncloud
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = owncloud
-PAK_VER	   = 6
+PAK_VER	   = 7
 
 DEPS       = ""
 
diff --git a/lfs/phpSANE b/lfs/phpSANE
index 5dad01d842..6a605f1fa2 100644
--- a/lfs/phpSANE
+++ b/lfs/phpSANE
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = phpSANE
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "sane netpbm"