Merge lp:~andreserl/maas/packaging_lp1236544 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
d/control: Bump depends on python-django to 1.4.

[Andres Rodriguez (andreserl)]

For this to work we also need: https://code.launchpad.net/~andreserl/maas/lp1236544/+merge/189692

[Scott Moser (smoser)]

Need a bug and a bug number for the d/control change.

Other than that LGTM.

[lp:~andreserl/maas/packaging_lp1236544]

210. By Andres Rodriguez on 2013-10-07

d/control: Bump depends on python-django to 1.4. (LP: #1236572)

211. By Andres Rodriguez on 2013-10-07

Update postinst

[Jeroen T. Vermeulen (jtv)]

In configure_cluster_http(), it might be worth extracting the new code into a separate function, e.g. enable_apache_version_module(). That way its purpose is immediately obvious, and when we maintain configure_cluster_http() in the future, we won't have to worry about exactly where else in the function COMMON_STATE might be used.

review: Approve

[lp:~andreserl/maas/packaging_lp1236544]

212. By Andres Rodriguez on 2013-10-08

Address comments

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-04 16:33:18 +0000
+++ debian/changelog	2013-10-08 13:51:33 +0000
@@ -1,6 +1,7 @@
 maas (1.4+bzr1656+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
+  * d/control: Bump depends on python-django to 1.4. (LP: #1236572)
 
  -- Andres Rodriguez <[e-mail]>  Fri, 04 Oct 2013 12:33:05 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2013-10-04 16:32:55 +0000
+++ debian/control	2013-10-08 13:51:33 +0000
@@ -59,7 +59,7 @@
          maas-common (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
-         python-django,
+         python-django (>= 1.4),
          python-django-maas (= ${binary:Version}),
          python-django-piston,
          python-django-south,
 
=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-07-29 19:50:11 +0000
+++ debian/maas-cluster-controller.postinst	2013-10-08 13:51:33 +0000
@@ -69,6 +69,13 @@
     echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf
 }
 
+enable_apache_version_mod(){
+    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+    if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        a2enmod version
+    fi
+}
+
 configure_cluster_http(){
     case $RELEASE in
         12.04|12.10|13.04)
@@ -132,6 +139,7 @@
         /etc/maas/maas_cluster.conf
 
     configure_cluster_uuid
+    enable_apache_version_mod
     configure_cluster_http
     restart_apache2
 fi