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

[Andres Rodriguez]

Add '/MAAS' to MAAS_DEFAULT_URL (LP: #1033956)
Add 'maas-dns' to enable related operations (LP: #1030860)

[Julian Edwards (julian-edwards)]

Looks ok to my untrained eye, so unblocking you.

review: Approve

[MAAS Lander (maas-lander)]

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/control

[MAAS Lander (maas-lander)]

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/control

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-25 15:27:24 +0000
+++ debian/changelog	2012-08-20 13:04:22 +0000
@@ -1,4 +1,14 @@
-maas (0.1+bzr777+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr865+dfsg-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/maas.postinst:
+    - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956)
+    - Update bzr version to safely upgrade.
+  * Add maas-dns package that configures DNS in MAAS (LP: #1030860)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 02 Aug 2012 09:01:43 -0400
+
+maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream release
   * Only run 'maas' command as root. (LP: #974046)

=== modified file 'debian/control'
--- debian/control	2012-08-16 10:05:17 +0000
+++ debian/control	2012-08-20 13:04:22 +0000
@@ -32,7 +32,7 @@
          tgt,
          ${misc:Depends},
          ${python:Depends}
-Recommends: openssh-server
+Recommends: openssh-server, maas-dns
 Suggests: maas-dhcp
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -95,3 +95,20 @@
  dynamic allocation to services being deployed on this MAAS.
  .
  This package configures a DHCP that can be used with MAAS.
+
+Package: maas-dns
+Architecture: all
+Depends: ${misc:Depends}, maas (= ${binary:Version}), bind9, isc-dhcp-server
+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Description: Ubuntu MAAS Server - DNS configuration (metapackage)
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package configures a DNS that can be used with MAAS.

=== added file 'debian/maas-dns.dirs'
--- debian/maas-dns.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.dirs	2012-08-20 13:04:22 +0000
@@ -0,0 +1,1 @@
+etc/bind/maas

=== added file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postinst	2012-08-20 13:04:22 +0000
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+	# If /etc/bind/maas is empty, set_up_dns.
+	if [ ! "$(ls -A /etc/bind/maas)" ]; then
+		maas set_up_dns
+	fi
+	# fix permissions
+	if [ -f /etc/bind/maas/named.conf.maas ]; then
+		chmod 644 /etc/bind/maas/named.conf.maas
+	fi
+	# add the required line to "/etc/bind/named.conf.local"
+	if ! grep -qs "^include.*\/etc\/bind\/maas\;$" /etc/bind/maas.conf.local; then
+		include_path=$(maas get_named_conf | grep "include\ [a-z\"\/\.]\+;")
+		sed -i "\$a $include_path" \
+			/etc/bind/named.conf.local
+	fi
+
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d bind9 restart || true
+	fi
+fi
+
+#DEBHELPER#
+exit 0

=== added file 'debian/maas-dns.postrm'
--- debian/maas-dns.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postrm	2012-08-20 13:04:22 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+	if [ -f /etc/bind/named.conf.local ]; then
+		sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
+			/etc/bind/named.conf.local
+	fi
+fi
+
+if [ "$1" = "purge" ]; then
+	# Remove zone files
+	if [ -d /etc/bind/maas ]; then
+		rm -rf /etc/bind/maas
+        fi
+fi
+
+if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke-rc.d bind9 restart || true
+fi
+
+#DEBHELPER#
+
+exit 0
+

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-07-25 14:19:10 +0000
+++ debian/maas.postinst	2012-08-20 13:04:22 +0000
@@ -131,7 +131,7 @@
 	local ipaddr="$1"
 
 	if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
-		sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/\"/" \
+		sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \
                     /etc/maas/maas_local_settings.py
 	fi
 
@@ -296,9 +296,9 @@
 	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
 		configure_maas_tgt
 	fi
-	# If upgrading from any version lower than 0.1+bzr777+dfsg-0ubuntu1
+	# If upgrading from any version lower than 0.1+bzr865+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr777+dfsg-0ubuntu1; then
+	if dpkg --compare-versions "$2" lt 0.1+bzr865+dfsg-0ubuntu1; then
 		# configure maas user for cobbler
 		configure_maas_cobbler_user
 		# configure pserv user for cobbler