Merge lp:~gandelman-a/ubuntu/saucy/horizon/apache24 into lp:~ubuntu-server-dev/horizon/havana

[Adam Gandelman]

Adds apache 2.4 transition. To avoid needing to carry a delta in the Cloud Archive, it also preserves apache 2.2. compatibility.

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-21 14:08:37 +0000
+++ debian/changelog	2013-08-31 01:43:04 +0000
@@ -1,3 +1,9 @@
+horizon (1:2013.2~b2-0ubuntu4) saucy; urgency=low
+
+  * Update for apache 2.4, preserve 2.2 compatability. (LP: #1218535)
+
+ -- Adam Gandelman <[e-mail]>  Fri, 30 Aug 2013 15:31:49 -0700
+
 horizon (1:2013.2~b2-0ubuntu3) saucy; urgency=low
 
   * debian/rules: Don't remove egg information while cleaning.

=== modified file 'debian/control'
--- debian/control	2013-07-22 18:36:36 +0000
+++ debian/control	2013-08-31 01:43:04 +0000
@@ -48,6 +48,7 @@
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: adduser,
+ apache2,
  libapache2-mod-wsgi (>= 2.3),
  python-django-horizon (= ${source:Version}),
  ${misc:Depends},

=== modified file 'debian/openstack-dashboard.dirs'
--- debian/openstack-dashboard.dirs	2012-09-11 03:23:07 +0000
+++ debian/openstack-dashboard.dirs	2013-08-31 01:43:04 +0000
@@ -1,3 +1,5 @@
+/etc/openstack-dashboard
+/usr/share/openstack-dashboard
 /usr/share/openstack-dashboard/bin/less/
 /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
 /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css

=== modified file 'debian/openstack-dashboard.install'
--- debian/openstack-dashboard.install	2012-09-11 03:23:07 +0000
+++ debian/openstack-dashboard.install	2013-08-31 01:43:04 +0000
@@ -1,4 +1,4 @@
-etc/apache2/conf.d
+debian/openstack-dashboard.conf etc/apache2/conf-available
 etc/openstack-dashboard
 usr/share/openstack-dashboard
 debian/static/openstack-dashboard/manifest.json usr/share/openstack-dashboard/openstack_dashboard/static/dashboard

=== modified file 'debian/openstack-dashboard.postinst'
--- debian/openstack-dashboard.postinst	2012-08-15 23:07:10 +0000
+++ debian/openstack-dashboard.postinst	2013-08-31 01:43:04 +0000
@@ -2,20 +2,38 @@
 
 set -e
 
+CONF="openstack-dashboard.conf"
+
 if [ "$1" = "configure" ]; then
-	# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf.d/openstack-dashboard.conf
+	# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf-available/openstack-dashboard.conf
 	dpkg-maintscript-helper mv_conffile \
-	  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
+	  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf-available/$CONF \
 	  2012.1~rc1-0ubuntu1 -- "$@"
 
-	if [ -x /etc/init.d/apache2 ]; then
-		invoke-rc.d --quiet apache2 reload
-	fi
+  # Transition config to apache 2.4 compatable location.
+  dpkg-maintscript-helper mv_conffile \
+   /etc/apache2/conf.d/$CONF \
+   /etc/apache2/conf-available/$CONF \
+   1:2013.2~b2-0ubuntu3 -- "$@"
 
   if [ -e /usr/share/openstack-dashboard/openstack_dashboard/static ] ; then
     chown -R www-data:www-data \
       /usr/share/openstack-dashboard/openstack_dashboard/static
   fi
+
+  A22_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+  if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+    # apache 2.4
+    . /usr/share/apache2/apache2-maintscript-helper
+    apache2_invoke enconf $CONF || exit $?
+  elif [ "$A22_STATE" = "installed" ] || [ "$A22_STATE" = "unpacked" ] ; then
+    # apache 2.2
+    [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF ] &&
+    ln -s ../conf-available/$CONF /etc/apache2/conf.d/$CONF
+    [ -x /etc/init.d/apache2 ] && invoke-rc.d --quiet apache2 reload
+  fi
+
 fi
 
 #DEBHELPER#

=== modified file 'debian/openstack-dashboard.postrm'
--- debian/openstack-dashboard.postrm	2012-06-22 15:31:09 +0000
+++ debian/openstack-dashboard.postrm	2013-08-31 01:43:04 +0000
@@ -2,13 +2,33 @@
 
 set -e
 
-# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf.d/openstack-dashboard.conf
+CONF="openstack-dashboard.conf"
+
+# /etc/apache2/conf.d/dashboard.conf -> /etc/apache2/conf-available/openstack-dashboard.conf
 dpkg-maintscript-helper mv_conffile \
-  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
+  /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf-available/$CONF \
   2012.1~rc1-0ubuntu1 -- "$@"
 
-if [ -x "`which invoke-rc.d 2>/dev/null`" -a -x "/etc/init.d/apache2" ] ; then
-	invoke-rc.d --quiet apache2 reload
+# Transition config to apache 2.4 compatable location.
+dpkg-maintscript-helper mv_conffile \
+ /etc/apache2/conf.d/openstack-dashboared.conf \
+ /etc/apache2/conf-available/openstack-dashboard.conf \
+ 1:2013.2~b2-0ubuntu3 -- "$@"
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then
+  A22_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+  if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+    # apache 2.4
+    . /usr/share/apache2/apache2-maintscript-helper
+    apache2_invoke disconf $CONF || exit $?
+  elif [ "$A22_STATE" = "installed" ] || [ "$A22_STATE" = "unpacked" ] ; then
+    # apache 2.2
+    [ -d /etc/apache2/conf.d/ ] && [ -L /etc/apache2/conf.d/$CONF ] &&
+    rm /etc/apache2/conf.d/$CONF
+    [ -x /etc/init.d/apache2 ] && invoke-rc.d --quiet apache2 reload
+  fi
+
 fi
 
 #DEBHELPER#

=== modified file 'debian/openstack-dashboard.preinst'
--- debian/openstack-dashboard.preinst	2012-06-22 15:31:09 +0000
+++ debian/openstack-dashboard.preinst	2013-08-31 01:43:04 +0000
@@ -7,4 +7,10 @@
   /etc/apache2/conf.d/dashboard.conf /etc/apache2/conf.d/openstack-dashboard.conf \
   2012.1~rc1-0ubuntu1 -- "$@"
 
+# Transition config to apache 2.4 compatable location.
+dpkg-maintscript-helper mv_conffile \
+ /etc/apache2/conf.d/openstack-dashboared.conf \
+ /etc/apache2/conf-available/openstack-dashboard.conf \
+ 1:2013.2~b2-0ubuntu3 -- "$@"
+
 #DEBHELPER#

=== modified file 'debian/rules'
--- debian/rules	2013-08-21 14:08:37 +0000
+++ debian/rules	2013-08-31 01:43:04 +0000
@@ -11,12 +11,12 @@
 	python setup.py install --root=$(CURDIR)/debian/tmp --no-compile -O0 --install-layout=deb
 	install -d -m 755 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
 	install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
-	install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf.d
-	
+	install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf-available
+
 	cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
+	install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
 	cp -a $(CURDIR)/openstack_dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-	
-	cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
+
 	cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
 		$(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
 	cp $(CURDIR)/manage.py \