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 77cf1f8f476cc27f9894ba448f78485313bc0d0e..6d7a10b5ed00f73780da338cd974ca78c5ee7253 100644 (file)
--- 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 f44e7b40ebb0301f5d83429f47e7454db5ecf947..d0e967d229ee562127b2df1e52268ffb2128ba59 100644 (file)
--- 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 ab562f24c94ff378a75f6ecea19a105b1fe89322..5d8d5a16f647127802997b5120a5313818d3aea6 100644 (file)
--- 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 1a88989d7ccb074ac910c696f3d2c736706406e7..5ff1499a85cfcbd8704bc740d3d7ccaa01c8c776 100644 (file)
--- 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 147595d162bd99f581f525a4a8073c352d682790..1980be70c917b018d92beda01c2a9879f57d00c9 100644 (file)
--- 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 e021a4c63aed6b7b379be66dd52bf5d8d75e1e6f..c13e2967839b1ba1f600c2120a25fb0c94d82f87 100644 (file)
--- 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 5dad01d842ba6ff9c7be7407ef176771319d59b7..6a605f1fa279d7ce934845dd65735b6a98782d1f 100644 (file)
--- 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"