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

[Andres Rodriguez]

Fix postinst configuration to handle both apache2.2 and apache2.4 config style.

[Julian Edwards (julian-edwards)]

41 + case $RELEASE in
42 + 12.04|12.10|13.04)

FYI I was previously told to use code names and not release names in packaging.

There is another bug you might have to fix as well - I recently upgraded from an older saucy before the apache conf change happened, and after the upgrade my apache conf was still in the wrong place.

Everything else looks ok to me, thanks for the fix!

review: Approve

[Andres Rodriguez (andreserl)]

Hi Julian,
So Sorry for the delay. I somehow missed this. I have made the changes to handle the upgrades for the region.

As far as the 12.04, 12.10, etc, I saw other postinst scripts doing it so I went forward to using it.

CHeers.

[Julian Edwards (julian-edwards)]

Looks good, land it!

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-07-18 14:14:21 +0000
+++ debian/maas-cluster-controller.postinst	2013-08-08 19:14:24 +0000
@@ -5,6 +5,8 @@
 . /usr/share/debconf/confmodule
 db_version 2.0
 
+RELEASE=`lsb_release -rs` || RELEASE=""
+
 create_log_dir() {
     # create log dir
     if [ ! -d /var/lib/maas ]; then
@@ -20,12 +22,12 @@
 }
 
 configure_maas_tgt(){
-	# Set up iSCSI: add maas.conf to tgt conf.d.
-	local tgtcfg="/etc/tgt/targets.conf"
-	[ -d /etc/tgt/conf.d/ ] || 
-	   echo "Warning! $tgtcfg did not exist" 1>&2;
-	mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
-	ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
+    # Set up iSCSI: add maas.conf to tgt conf.d.
+    local tgtcfg="/etc/tgt/targets.conf"
+    [ -d /etc/tgt/conf.d/ ] || 
+        echo "Warning! $tgtcfg did not exist" 1>&2;
+    mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
+    ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
 }
 
 extract_cluster_uuid(){
@@ -68,11 +70,21 @@
 }
 
 configure_cluster_http(){
-    # handle apache configs
-    if [ -e /etc/maas/maas-cluster-http.conf -a \
-        ! -e /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
-        ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf-enabled/maas-cluster-http.conf
-    fi
+    case $RELEASE in
+        12.04|12.10|13.04)
+            if [ -e /etc/maas/maas-cluster-http.conf -a \
+                ! -e /etc/apache2/conf.d/maas-cluster-http.conf ]; then
+                ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf.d/maas-cluster-http.conf
+            fi
+            ;;
+        *)
+            # handle apache configs
+            if [ -e /etc/maas/maas-cluster-http.conf -a \
+                ! -e /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+                ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf-enabled/maas-cluster-http.conf
+            fi
+            ;;
+    esac
 }
 
 restart_apache2(){

=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2013-07-18 14:14:21 +0000
+++ debian/maas-cluster-controller.postrm	2013-08-08 19:14:24 +0000
@@ -4,14 +4,25 @@
 
 #DEBHELPER#
 
+RELEASE=`lsb_release -rs` || RELEASE=""
+
 case "$1" in
         purge)
 		# remove log directory
 		rm -rf /var/log/maas
-		# remove apache2 config
-		if [ -h /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
-			rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
-		fi
+		case $RELEASE in
+			12.04|12.10|13.04)
+				if [ -h /etc/apache2/conf.d/maas-cluster-http.conf ]; then
+					rm -rf /etc/apache2/conf.d/maas-cluster-http.conf
+				fi
+				;;
+			*)
+				# remove apache2 config
+				if [ -h /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+					rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
+				fi
+				;;
+		esac
 		# remove var directory
 		rm -rf /var/lib/maas/celerybeat-cluster-schedule
 		DIR=/var/lib/maas

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2013-07-18 14:14:21 +0000
+++ debian/maas-region-controller.postinst	2013-08-08 19:14:24 +0000
@@ -9,6 +9,8 @@
 	. /usr/share/dbconfig-common/dpkg/postinst.pgsql
 fi
 
+RELEASE=`lsb_release -rs` || RELEASE=""
+
 maas_sync_migrate_db(){
 	maas syncdb --noinput
 	maas migrate maasserver --noinput
@@ -27,6 +29,29 @@
 	invoke-rc.d squid-deb-proxy restart || true
 }
 
+configure_region_http() {
+	case $RELEASE in
+		12.04|12.10|13.04)
+			# handle apache configs
+			if [ -e /etc/maas/maas-http.conf -a \
+				! -e /etc/apache2/conf.d/maas-http.conf ]; then
+				ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
+			fi
+			;;
+		*)
+			# handle apache configs
+			if [ -e /etc/maas/maas-http.conf -a \
+				! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
+				ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
+			fi
+			;;
+	esac
+	# enable apache modules needed
+	a2enmod proxy_http
+	a2enmod expires
+	a2enmod wsgi
+}
+
 configure_maas_txlongpoll_rabbitmq_user() {
 	local longpoll_user="maas_longpoll"
 	local longpoll_pass=
@@ -127,16 +152,7 @@
 	#########################################################
 	################  Configure Apache2  ####################
 	#########################################################
-	# handle apache configs
-	if [ -e /etc/maas/maas-http.conf -a \
-		! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
-		ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
-	fi
-
-	# enable apache modules needed
-	a2enmod proxy_http
-	a2enmod expires
-	a2enmod wsgi
+	configure_region_http
 
 	#########################################################
 	##########  Configure DEFAULT_MAAS_URL  #################
@@ -234,6 +250,9 @@
 	# make sure postgresql is running
 	restart_postgresql
 
+	# make sure maas http config is symlinked
+	configure_region_http
+
 	# we need to regenerate the passwords and update configs.
 	db_get maas/default-maas-url
 	ipaddr="$RET"

=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2013-07-18 14:14:21 +0000
+++ debian/maas-region-controller.postrm	2013-08-08 19:14:24 +0000
@@ -4,6 +4,8 @@
 
 . /usr/share/debconf/confmodule
 
+RELEASE=`lsb_release -rs` ||  RELEASE=""
+
 if [ -f /etc/dbconfig-common/maas.conf ]; then
 	if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
 		. /usr/share/dbconfig-common/dpkg/postrm.pgsql
@@ -15,9 +17,18 @@
 	purge)
 		rm -rf /var/log/maas
 		rm -rf /var/lib/maas
-		if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
-			rm -rf /etc/apache2/conf-enabled/maas-http.conf
-		fi
+		case $RELEASE in
+			12.04|12.10|13.04)
+				if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
+					rm -rf /etc/apache2/conf.d/maas-http.conf
+				fi
+				;;
+			*)
+				if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
+					rm -rf /etc/apache2/conf-enabled/maas-http.conf
+				fi
+				;;
+		esac
 
 		# Restarting apache2
 		if [ -x /usr/sbin/invoke-rc.d ]; then