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

[Andres Rodriguez]

Simplify postinst to not do the same configuration in the same places.

[lp:~andreserl/maas/packaging_simplify_postinst]

345. By Andres Rodriguez on 2015-01-20

debian/maas-region-controller{-min}.postinst: Simplify postinsts.

[Raphaël Badin (rvb)]

Looks good… seems you've cleaned up a fair amount of duplication…

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-17 18:44:56 +0000
+++ debian/changelog	2015-01-20 17:05:18 +0000
@@ -1,4 +1,4 @@
-maas (1.8.0~alpha1+bzr3463-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.8.0~alpha1+bzr3480-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Blake Rouse ]
   * debian/control: added python-pyscss as a build dependency.
@@ -16,6 +16,7 @@
   * debian/control: Tighten Dependency versioning of some packages.
   * debian/maas-region-controller-min.preinst: Handle upgrades to remove
     legacy files.
+  * debian/maas-region-controller{-min}.postinst: Simplify postinsts.
 
   [ Gavin Panella ]
   * debian/maas-region-controller-min.maas-regiond.upstart

=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2015-01-17 18:44:56 +0000
+++ debian/maas-region-controller-min.postinst	2015-01-20 17:05:18 +0000
@@ -30,6 +30,37 @@
     a2enmod rewrite
 }
 
+configure_logging() {
+	# Give appropriate permissions
+	if [ ! -f /var/log/maas/regiond.log ]; then
+		touch /var/log/maas/regiond.log
+	fi
+	chown -R maas:maas /var/log/maas
+	chmod -R 775 /var/log/maas/oops
+
+	# Main syslog file.
+	if [ ! -f /var/log/maas/maas.log ]; then
+		touch /var/log/maas/maas.log
+	fi
+	chown syslog:syslog /var/log/maas/maas.log
+
+	# Create log directory base
+	mkdir -p /var/log/maas/rsyslog
+	chown -R syslog:syslog /var/log/maas/rsyslog
+	# Make sure rsyslog reads our config
+	invoke-rc.d rsyslog restart
+
+	# If proxy log dir exists, set correct permissions
+	if [ -d /var/log/maas/proxy ]; then
+		chown -R proxy:proxy /var/log/maas/proxy
+	fi
+}
+
+
+configure_third_party_log_symlinks() {
+	ln -sf /var/log/apache2 /var/log/maas/
+}
+
 configure_maas_default_url() {
     local ipaddr="$1"
 
@@ -86,30 +117,8 @@
     #########################################################
     ################  Configure Logging  ####################
     #########################################################
-
-    # Give appropriate permissions
-    if [ ! -f /var/log/maas/regiond.log ]; then
-        touch /var/log/maas/regiond.log
-    fi
-    chown -R maas:maas /var/log/maas
-    chmod -R 775 /var/log/maas/oops
-
-    # Main syslog file.
-    if [ ! -f /var/log/maas/maas.log ]; then
-        touch /var/log/maas/maas.log
-    fi
-    chown syslog:syslog /var/log/maas/maas.log
-
-    # Create log directory base
-    mkdir -p /var/log/maas/rsyslog
-    chown -R syslog:syslog /var/log/maas/rsyslog
-    # Make sure rsyslog reads our config
-    invoke-rc.d rsyslog restart
-
-    # If proxy log dir exists, set correct permissions
-    if [ -d /var/log/maas/proxy ]; then
-        chown -R proxy:proxy /var/log/maas/proxy
-    fi
+    configure_logging
+    configure_third_party_log_symlinks
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     # Set the IP address of the interface with default route
@@ -120,6 +129,10 @@
     fi
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
+    # Logging changed at r2611, ensure it is set up.
+    configure_logging
+    configure_third_party_log_symlinks
+
     # If upgrading to any later package version, then upgrade db.
     invoke-rc.d apache2 stop || true
 

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2015-01-17 18:44:56 +0000
+++ debian/maas-region-controller.postinst	2015-01-20 17:05:18 +0000
@@ -21,29 +21,6 @@
 	invoke-rc.d --force postgresql 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 rewrite
-}
-
 configure_maas_database() {
 	local dbc_dbpass="$1"
 	if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then
@@ -72,35 +49,6 @@
         echo $ipaddr
 }
 
-configure_logging() {
-	# Give appropriate permissions
-	if [ ! -f /var/log/maas/regiond.log ]; then
-		touch /var/log/maas/regiond.log
-	fi
-	chown -R maas:maas /var/log/maas
-	chmod -R 775 /var/log/maas/oops
-
-	# Main syslog file.
-	if [ ! -f /var/log/maas/maas.log ]; then
-		touch /var/log/maas/maas.log
-	fi
-	chown syslog:syslog /var/log/maas/maas.log
-
-	# Create log directory base
-	mkdir -p /var/log/maas/rsyslog
-	chown -R syslog:syslog /var/log/maas/rsyslog
-	# Make sure rsyslog reads our config
-	invoke-rc.d rsyslog restart
-
-	# If proxy log dir exists, set correct permissions
-	if [ -d /var/log/maas/proxy ]; then
-		chown -R proxy:proxy /var/log/maas/proxy
-	fi
-}
-
-configure_third_party_log_symlinks() {
-	ln -sf /var/log/apache2 /var/log/maas/
-}
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
 	#########################################################
@@ -115,11 +63,6 @@
 	chmod 0640 /etc/maas/maas_local_settings.py
 
 	#########################################################
-	################  Configure Apache2  ####################
-	#########################################################
-	configure_region_http
-
-	#########################################################
 	##########  Configure DEFAULT_MAAS_URL  #################
 	#########################################################
 
@@ -138,13 +81,6 @@
 	fi
 
 	#########################################################
-	################  Configure Logging  ####################
-	#########################################################
-
-	configure_logging
-	configure_third_party_log_symlinks
-
-	#########################################################
 	################  Configure Database  ###################
 	#########################################################
 
@@ -174,19 +110,12 @@
 	fi
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
-	# Logging changed at r2611, ensure it is set up.
-	configure_logging
-	configure_third_party_log_symlinks
-
 	# If upgrading to any later package version, then upgrade db.
 	invoke-rc.d apache2 stop || true
 
 	# 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"