Merge lp:~julian-edwards/maas/packaging.trunk into lp:~maas-maintainers/maas/packaging

[Julian Edwards]

Ensure that logging is reconfigured on package upgrades so that the new syslog logging works.

[Andres Rodriguez (andreserl)]

lgtm. Lines 75, 82-85 require have funny indentation.

review: Approve

[Julian Edwards (julian-edwards)]

> lgtm. Lines 75, 82-85 require have funny indentation.

ARGH. Bloody TABS in the file.

[lp:~julian-edwards/maas/packaging.trunk]

291. By Julian Edwards on 2014-07-30

use TABS, argh

292. By Julian Edwards on 2014-07-30

use TABS, argh

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-29 10:51:48 +0000
+++ debian/changelog	2014-07-30 17:17:16 +0000
@@ -1,4 +1,4 @@
-maas (1.6+bzr2367-0ubuntu3) UNRELEASED; urgency=medium
+maas (1.6+bzr2367-0ubuntu4) UNRELEASED; urgency=medium
 
   * UNRELEASED
 
@@ -41,8 +41,9 @@
      debian/maas-region-controller-min.postinst
      debian/maas-region-controller.postinst
     - Install /var/log/maas/maas.log as a syslog file.
+    - Ensure logging is set up for upgrades 
 
- -- Julian Edwards <[e-mail]>  Tue, 29 Jul 2014 11:49:39 +0100
+ -- Julian Edwards <[e-mail]>  Wed, 30 Jul 2014 18:07:50 +0100
 
 maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
 

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-07-29 11:35:17 +0000
+++ debian/maas-region-controller.postinst	2014-07-30 17:17:16 +0000
@@ -144,6 +144,27 @@
              /usr/share/maas/conf/99-maas
 }
 
+configure_logging() {
+	# Give appropriate permissions
+	if [ ! -f /var/log/maas/maas-django.log ]; then
+		touch /var/log/maas/maas-django.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 [ "$1" = "configure" ] && [ -z "$2" ]; then
 	#########################################################
 	################ Folder Permissions  ####################
@@ -188,24 +209,7 @@
 	################  Configure Logging  ####################
 	#########################################################
 
-	# Give appropriate permissions
-	if [ ! -f /var/log/maas/maas-django.log ]; then
-		touch /var/log/maas/maas-django.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
+	configure_logging
 
 	#########################################################
 	################### Squid-deb-proxy  ####################
@@ -261,6 +265,9 @@
 	configure_maas_txlongpoll_rabbitmq_user
 
 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
+
 	# If upgrading to any later package version, then upgrade db.
 	invoke-rc.d apache2 stop || true