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

[Andres Rodriguez]

* debian/maas-dhcp.config: Ask whether we want to enable DHCP (LP: #1044229)
* debian/maas.prerm: Stop services before removing database (LP: #1044559)

[Andres Rodriguez (andreserl)]

Reviewing/approving myself. This has been tested and are simple changes.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-31 19:13:57 +0000
+++ debian/changelog	2012-09-04 17:01:19 +0000
@@ -29,6 +29,8 @@
     - debian/maas.postrm: Only call dbc_go when config file exists.
   * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.
   * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)
+  * debian/maas-dhcp.config: Ask whether we want to enable DHCP (LP: #1044229)
+  * debian/maas.prerm: Stop services before removing database (LP: #1044559)
 
  -- Andres Rodriguez <[e-mail]>  Thu, 02 Aug 2012 09:01:43 -0400
 

=== modified file 'debian/maas-dhcp.config'
--- debian/maas-dhcp.config	2012-08-27 18:36:10 +0000
+++ debian/maas-dhcp.config	2012-09-04 17:01:19 +0000
@@ -4,14 +4,19 @@
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then
         . /usr/share/debconf/confmodule
 
-	db_input high maas-dhcp/maas-dhcp-range || true
-	db_go
-	db_input high maas-dhcp/maas-dhcp-netmask || true
-	db_go
-	db_input high maas-dhcp/maas-dhcp-broadcast || true
-	db_go
-	db_input high maas-dhcp/maas-dhcp-gateway || true
-	db_go
+	db_input high maas-dhcp/maas-dhcp-enabled || true
+	db_go
+	db_get maas-dhcp/maas-dhcp-enabled || true
+	if [ "$RET" = "true" ]; then
+		db_input high maas-dhcp/maas-dhcp-range || true
+		db_go
+		db_input high maas-dhcp/maas-dhcp-netmask || true
+		db_go
+		db_input high maas-dhcp/maas-dhcp-broadcast || true
+		db_go
+		db_input high maas-dhcp/maas-dhcp-gateway || true
+		db_go
+	fi
 
 fi
 #DEBHELPER#

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-08-28 16:13:51 +0000
+++ debian/maas-dhcp.postinst	2012-09-04 17:01:19 +0000
@@ -4,26 +4,29 @@
 db_version 2.0
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
-	# Obtain the DHCP range
-	db_get maas-dhcp/maas-dhcp-range || true
-	range="$RET"
-	range_low=$(echo $range | cut -f1 -d",")
-	range_high=$(echo $range | cut -f2 -d",")
-
-	# Obtain the netmask
-	db_get maas-dhcp/maas-dhcp-netmask || true
-	netmask="$RET"
-
-	# Obtain the broadcast
-	db_get maas-dhcp/maas-dhcp-broadcast || true
-	broadcast="$RET"
-
-	# Obtain the gateway
-	db_get maas-dhcp/maas-dhcp-gateway || true
-	gateway="$RET"
-
-	maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
+	db_get maas-dhcp/maas-dhcp-enabled || true
+	if [ "$RET" = "true" ]; then
+		# Obtain the DHCP range
+		db_get maas-dhcp/maas-dhcp-range || true
+		range="$RET"
+		range_low=$(echo $range | cut -f1 -d",")
+		range_high=$(echo $range | cut -f2 -d",")
+
+		# Obtain the netmask
+		db_get maas-dhcp/maas-dhcp-netmask || true
+		netmask="$RET"
+
+		# Obtain the broadcast
+		db_get maas-dhcp/maas-dhcp-broadcast || true
+		broadcast="$RET"
+
+		# Obtain the gateway
+		db_get maas-dhcp/maas-dhcp-gateway || true
+		gateway="$RET"
+
+		maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
 				--router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast"
+	fi
 
 fi
 

=== modified file 'debian/maas-dhcp.templates'
--- debian/maas-dhcp.templates	2012-08-27 18:36:10 +0000
+++ debian/maas-dhcp.templates	2012-09-04 17:01:19 +0000
@@ -1,3 +1,11 @@
+Template: maas-dhcp/maas-dhcp-enabled
+Type: boolean
+Default: true
+_Description: Enable Ubuntu MAAS Server managed DHCP:
+ Ubuntu MAAS Server can manage DHCP for address allocation for
+ the provisioned systems.  If you manage your DHCP elsewhere,
+ you should disable this option.
+
 Template: maas-dhcp/maas-dhcp-range
 Type: string
 Default: 192.168.1.5,192.168.1.200

=== modified file 'debian/maas.prerm'
--- debian/maas.prerm	2012-03-14 02:01:25 +0000
+++ debian/maas.prerm	2012-09-04 17:01:19 +0000
@@ -3,9 +3,16 @@
 set -e
 
 . /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke-rc.d apache2 stop || true
+else
+	/etc/init.d/apache2 stop || true
+fi
+
 . /usr/share/dbconfig-common/dpkg/prerm.pgsql
 dbc_go maas $@
 
-#DEBHELPER#
-
 exit 0