From 4895d4d9bef4ac4692a1817a3be35dfce6598716 Mon Sep 17 00:00:00 2001
From: Matthieu CERDA <matthieu.cerda@normation.com>
Date: Mon, 29 Sep 2014 17:47:57 +0200
Subject: [PATCH] Fixes #5160: Make the packaging Apache 2.4 compliant

---
 rudder-webapp/SOURCES/rudder-networks-24.conf |  1 +
 rudder-webapp/SPECS/rudder-webapp.spec        |  4 ++++
 rudder-webapp/debian/conffiles                |  1 +
 rudder-webapp/debian/links                    |  2 ++
 rudder-webapp/debian/postinst                 | 11 +++++++++++
 rudder-webapp/debian/rules                    |  1 +
 6 files changed, 20 insertions(+)
 create mode 100644 rudder-webapp/SOURCES/rudder-networks-24.conf

diff --git a/rudder-webapp/SOURCES/rudder-networks-24.conf b/rudder-webapp/SOURCES/rudder-networks-24.conf
new file mode 100644
index 000000000..b66e80882
--- /dev/null
+++ b/rudder-webapp/SOURCES/rudder-networks-24.conf
@@ -0,0 +1 @@
+Require all denied
diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec
index 1b5df9fb1..fade77000 100644
--- a/rudder-webapp/SPECS/rudder-webapp.spec
+++ b/rudder-webapp/SPECS/rudder-webapp.spec
@@ -85,6 +85,7 @@ Group: Applications/System
 Source1: rudder-users.xml
 Source2: rudder.xml
 Source3: rudder-networks.conf
+Source4: rudder-networks-24.conf
 Source5: rudder-upgrade
 Source6: rudder-upgrade-database
 Source7: rudder-webapp
@@ -212,7 +213,9 @@ cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/apache2-sys
 
 install -m 644 %{SOURCE2} %{buildroot}%{rudderdir}/share/webapps/
 
+# Copy stub rudder-networks*.conf
 cp %{SOURCE3} %{buildroot}%{rudderdir}/etc/
+cp %{SOURCE4} %{buildroot}%{rudderdir}/etc/
 
 %if 0%{?sles_version}
 # On SLES, change the Apache DocumentRoot to the OS default
@@ -476,6 +479,7 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/%{apache_vhost_dir}/rudder-vhost.conf
 %config(noreplace) /etc/%{apache_vhost_dir}/rudder-vhost-ssl.conf
 %config(noreplace) %{rudderdir}/etc/rudder-networks.conf
+%config(noreplace) %{rudderdir}/etc/rudder-networks-24.conf
 %config(noreplace) /etc/sysconfig/rudder-apache
 /usr/share/doc/rudder
 %{rudderdir}/bin/rudder-upgrade-database
diff --git a/rudder-webapp/debian/conffiles b/rudder-webapp/debian/conffiles
index 7f84bb81d..5023d4a8b 100644
--- a/rudder-webapp/debian/conffiles
+++ b/rudder-webapp/debian/conffiles
@@ -5,4 +5,5 @@
 /etc/apache2/sites-available/rudder-vhost
 /etc/apache2/sites-available/rudder-vhost-ssl
 /opt/rudder/etc/rudder-networks.conf
+/opt/rudder/etc/rudder-networks-24.conf
 /opt/rudder/etc/rudder-passwords.conf
diff --git a/rudder-webapp/debian/links b/rudder-webapp/debian/links
index 2d5bfd308..eb340b2a5 100644
--- a/rudder-webapp/debian/links
+++ b/rudder-webapp/debian/links
@@ -1 +1,3 @@
 /opt/rudder/bin/rudder-init  /opt/rudder/bin/rudder-init.sh
+/etc/apache2/sites-available/rudder-vhost  /etc/apache2/sites-available/rudder-vhost.conf
+/etc/apache2/sites-available/rudder-vhost-ssl  /etc/apache2/sites-available/rudder-vhost-ssl.conf
diff --git a/rudder-webapp/debian/postinst b/rudder-webapp/debian/postinst
index cb5207362..8bf8eb7c3 100644
--- a/rudder-webapp/debian/postinst
+++ b/rudder-webapp/debian/postinst
@@ -28,11 +28,22 @@ case "$1" in
   invoke-rc.d rsyslog restart >/dev/null 2>&1
   echo "Done"
 
+  APACHE_VERSION=$(apache2 -v|grep Apache|sed "s%^.*Apache/\([1-9].[1-9]\).*%\1%")
+
   SITES_TO_DISABLE="default rudder-default rudder-default-ssl"
   SITES_TO_ENABLE="rudder-vhost rudder-vhost-ssl"
 
   MODULES_TO_ENABLE="dav_fs rewrite proxy_http headers ssl"
 
+  # Migration: Clean up old vhosts if we are running Apache 2.4
+  if [ ${APACHE_VERSION} = 2.4 ]
+  then
+    for i in ${SITES_TO_ENABLE}
+    do
+      [ -e /etc/apache2/sites-enabled/${i} ] && rm -f /etc/apache2/sites-enabled/${i}
+    done
+  fi
+
   for dissite in ${SITES_TO_DISABLE}
   do
     a2dissite ${dissite} >/dev/null 2>&1 || true
diff --git a/rudder-webapp/debian/rules b/rudder-webapp/debian/rules
index 152d57fdd..ea159efc8 100755
--- a/rudder-webapp/debian/rules
+++ b/rudder-webapp/debian/rules
@@ -86,6 +86,7 @@ binary-arch: install
 	dh_install --SOURCEDIR=$(CURDIR)/BUILD/ rudder-vhost-ssl /etc/apache2/sites-available/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder.xml /opt/rudder/share/webapps/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks.conf /opt/rudder/etc/
+	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks-24.conf /opt/rudder/etc/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-passwords.conf /opt/rudder/etc/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-webapp /opt/rudder/etc/server-roles.d/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-web /opt/rudder/etc/server-roles.d/