Merge lp:~andreserl/maas/fix_lp1413388_1.7 into lp:~maas-maintainers/maas/packaging.utopic

[Andres Rodriguez]

LP: #1413388 Handle upgrades to migrate named.conf.settings

[lp:~andreserl/maas/fix_lp1413388_1.7]

367. By Andres Rodriguez on 2015-07-07

Address Mike's comments

[Mike Pontillo (mpontillo)]

Looks good. Just one unused variable below.

review: Approve

[lp:~andreserl/maas/fix_lp1413388_1.7]

368. By Andres Rodriguez on 2015-07-08

* New upstream release 1.7.6 bzr3375:
  - Accept list of forwarders for upstream_dns rather than just
    one. (LP: #1470585)
  - Fix upgrade issue where it would remove custom DNS config,
    potentially breaking DNS. (LP: #1413388)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-04 02:22:25 +0000
+++ debian/changelog	2015-07-08 01:12:03 +0000
@@ -1,9 +1,19 @@
-maas (1.7.6+bzr3369-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.7.6+bzr3375-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release 1.7.6 bzr3375:
+    - Accept list of forwarders for upstream_dns rather than just
+      one. (LP: #1470585)
+    - Fix upgrade issue where it would remove custom DNS config,
+      potentially breaking DNS. (LP: #1413388)
 
   [ Raphaël Badin ]
   * Drop dependency on python-iscpy: the code has been integrated into
     MAAS. (LP: #1413388).
 
+  [ Andres Rodriguez ]
+  * Refactor maas-dns upgrade code so it doesn't break local DNS config
+    and it gets migrated (LP: #1413388)
+
  -- Andres Rodriguez <[e-mail]>  Fri, 03 Jul 2015 00:11:50 -0400
 
 maas (1.7.5+bzr3369-0ubuntu1) vivid; urgency=medium

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2014-03-28 15:44:39 +0000
+++ debian/maas-dns.postinst	2015-07-08 01:12:03 +0000
@@ -31,16 +31,14 @@
     # /etc/named/maas/named.conf.options.inside.maas file.
     maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
 
-    invoke-rc.d bind9 restart || true
+elif [ "$1" = "configure" ]; then
+	# If the /etc/bind/named.conf.options is not set up yet, do it now.
+	# This might happen because of an upgrade from an older package.
+	if ! grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options; then
+		maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
+	fi
 fi
 
-if [ "$1" = "configure" ]; then
-    # If the /etc/bind/named.conf.options is not set up yet, do it now.
-    # This might happen because of an upgrade from an older package.
-    if ! grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options; then
-        maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
-        invoke-rc.d bind9 restart || true
-    fi
-fi
+invoke-rc.d bind9 restart || true
 
 #DEBHELPER#

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-10-10 12:27:35 +0000
+++ debian/maas-region-controller.postinst	2015-07-08 01:12:03 +0000
@@ -102,6 +102,16 @@
 	ln -sf /var/log/apache2 /var/log/maas/
 }
 
+configure_migrate_maas_dns() {
+	# This only runs on upgrade. We only run this if the
+	# there are forwarders to migrate or no
+	# named.conf.options.inside.maas are present.
+	maas-region-admin edit_named_options \
+	    --migrate-conflicting-options --config-path \
+	    /etc/bind/named.conf.options || true
+	invoke-rc.d bind9 restart || true
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
 	#########################################################
 	################ Folder Permissions  ####################
@@ -204,6 +214,7 @@
 
 	maas_sync_migrate_db
 
+	configure_migrate_maas_dns
 fi
 
 invoke-rc.d apache2 restart || true