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

[Andres Rodriguez]

* New upstream release (Fixes LP: #981103)
  * debian/maas.postinst:
    - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282)
    - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to
      correctly re-generate passwords, and not have db sync/migrate issues
      as config has changed upstream.
    - Correctly set Passwords for PSERV, otherwise it won't set new passwords.
  * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970)
    - debian/maas.config: Add reconfigure validation to correctly allow it,
      and ask a question.
    - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler
      server and next_server for PXE/Provisioning.
    - debian/maas.templates: Add debconf question and update info.
  * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309)
  * debian/maas.postinst:
    - Set cobbler password in between quotes (LP: #984427)
    - Do not change permissions to maas.log (LP: #980915)

[Francis J. Lacoste (flacoste)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-13 13:56:10 +0000
+++ debian/changelog	2012-04-18 06:50:39 +0000
@@ -1,8 +1,24 @@
-maas (0.1+bzr462+dfsg-0ubuntu2) UNRELEASED; urgency=low
-
-  * UNRELEASED
-
- -- Andres Rodriguez <[e-mail]>  Fri, 13 Apr 2012 09:55:41 -0400
+maas (0.1+bzr473+dfsg-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release (Fixes LP: #981103)
+  * debian/maas.postinst:
+    - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282)
+    - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to
+      correctly re-generate passwords, and not have db sync/migrate issues
+      as config has changed upstream.
+    - Correctly set Passwords for PSERV, otherwise it won't set new passwords.
+  * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970)
+    - debian/maas.config: Add reconfigure validation to correctly allow it,
+      and ask a question.
+    - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler
+      server and next_server for PXE/Provisioning.
+    - debian/maas.templates: Add debconf question and update info.
+  * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309)
+  * debian/maas.postinst:
+    - Set cobbler password in between quotes (LP: #984427)
+    - Do not change permissions to maas.log (LP: #980915)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Apr 2012 23:44:46 -0700
 
 maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-04-11 00:11:53 +0000
+++ debian/control	2012-04-18 06:50:39 +0000
@@ -11,7 +11,7 @@
 Architecture: all
 Depends: apache2,
          avahi-daemon,
-         cobbler,
+         maas-provision (>= 2.2.2),
          dbconfig-common,
          distro-info,
          libapache2-mod-wsgi,
 
=== modified file 'debian/maas.config'
--- debian/maas.config	2012-04-10 19:26:20 +0000
+++ debian/maas.config	2012-04-18 06:50:39 +0000
@@ -5,15 +5,15 @@
 
 # creates question
 set_question() {
-        if ! db_fget "$1" seen; then
-                db_register dbconfig-common/dbconfig-install "$1"
-                db_subst "$1" ID "$1"
-                db_fget "$1" seen
-        fi
-        if [ "$RET" = false ]; then
-                db_set "$1" "$2"
-                db_fset "$1" seen true
-        fi
+	if ! db_fget "$1" seen; then
+		db_register dbconfig-common/dbconfig-install "$1"
+		db_subst "$1" ID "$1"
+		db_fget "$1" seen
+	fi
+	if [ "$RET" = false ]; then
+		db_set "$1" "$2"
+		db_fset "$1" seen true
+	fi
 }
 
 # source dbconfig-common shell library, and call the hook function
@@ -30,4 +30,15 @@
 	set_question maas/dbconfig-install true
 	set_question maas/pgsql/app-pass ""
 	dbc_go maas $@
+
+elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+	db_get maas/default-maas-url || true
+	if [ -n "$RET" ]; then
+		db_set maas/default-maas-url "$RET"
+	else
+		ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py)
+		db_set maas/default-maas-url "$ipaddr"
+	fi
+	db_input low maas/default-maas-url || true
+	db_go
 fi
 
=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-04-12 17:53:35 +0000
+++ debian/maas.postinst	2012-04-18 06:50:39 +0000
@@ -21,6 +21,30 @@
 	fi
 }
 
+restart_rabbitmq(){
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d rabbitmq-server restart || true
+	else
+		/etc/init.d/rabbitmq-server restart || true
+	fi
+}
+
+restart_postgresql(){
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d --force postgresql restart || true
+	else
+		/etc/init.d/postgresql restart || true
+	fi
+}
+
+restart_cobbler(){
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d cobbler restart || true
+	else
+		/etc/init.d/cobbler restart || true
+	fi
+}
+
 add_user_group(){
 	local user="maas"
 	local group="maas"
@@ -46,19 +70,19 @@
 	htpasswd -D /etc/cobbler/users.digest "maas" || true
 	printf "maas:Cobbler:$hash\n" >> /etc/cobbler/users.digest
 
-	if grep -qs "^\ \{1,\}password: [a-zA-Z0-9]\{1,\}$" /etc/maas/pserv.yaml; then
-		sed -i "s/^\ \{1,\}password: [a-zA-Z0-9]\{1,\}$/  password: "$cblr_pass"/" /etc/maas/pserv.yaml
+	if grep -qs "^\ \{1,\}password:.*$" /etc/maas/pserv.yaml; then
+		sed -i "s/^\ \{1,\}password:.*$/  password: \""$cblr_pass"\"/" /etc/maas/pserv.yaml
 	fi
 }
 
 configure_maas_pserv_user() {
 	local pserv_pass=
 	pserv_pass="$(pwgen -s 20)"
-	if grep -qs "^password: \"test\"" /etc/maas/pserv.yaml; then
-		sed -i '/^password:/s/"test"/"'"${pserv_pass}"'"/' /etc/maas/pserv.yaml
+	if grep -qs "^password: \".*\"$" /etc/maas/pserv.yaml; then
+		sed -i '/^password:/s/".*"$/"'"${pserv_pass}"'"/' /etc/maas/pserv.yaml
 	fi
 	if grep -qs "^PSERV_URL\ =\ " /etc/maas/maas_local_settings.py; then
-		sed -i '/^PSERV_URL[ =]/s/:password@/:'"${pserv_pass}"'@/' /etc/maas/maas_local_settings.py
+		sed -i '/^PSERV_URL[ =]/s/maas:.*@/'"maas:${pserv_pass}"'@/' /etc/maas/maas_local_settings.py
 	fi
 }
 
@@ -103,6 +127,23 @@
 	ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
 }
 
+configure_maas_default_url() {
+	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"\/\"/" \
+                    /etc/maas/maas_local_settings.py
+	fi
+
+	# Replace for PXE
+	if grep -qs "^next_server:.*$" /etc/cobbler/settings; then
+		sed -i "s/^next_server:.*$/next_server: $ipaddr/" /etc/cobbler/settings
+	fi
+	if grep -qs "^server:.*$" /etc/cobbler/settings; then
+		sed -i "s/^server:.*$/server: $ipaddr/" /etc/cobbler/settings
+	fi
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
 	#########################################################
 	################ User/Group Creatiion  ##################
@@ -157,11 +198,9 @@
 	ipaddr=${ipaddr%%/*}
 	# Set the IP address of the interface with default route
 	if [ -n "$ipaddr" ]; then
-		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"\/\"/" \
-                               /etc/maas/maas_local_settings.py
-		fi
+		configure_maas_default_url "$ipaddr"
 		db_subst maas/installation-note MAAS_URL "$ipaddr"
+		db_set maas/default-maas-url "$ipaddr"
 	fi
 
 	#########################################################
@@ -173,7 +212,6 @@
 		touch /var/log/maas/maas.log
 	fi
 	chown -R maas:maas /var/log/maas
-	chmod 620 /var/log/maas/maas.log
 	chmod -R 775 /var/log/maas/oops
 
 	# Create log directory base
@@ -197,11 +235,7 @@
 	#########################################################
 
 	# Handle longpoll/rabbitmq publishing
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-		invoke-rc.d rabbitmq-server restart || true
-	else
-		/etc/init.d/rabbitmq-server restart || true
-	fi
+	restart_rabbitmq
 	configure_maas_txlongpoll_rabbitmq_user
 
 	#########################################################
@@ -214,11 +248,7 @@
 	#########################################################
 
 	# Need to for postgresql start so it doesn't fail on the installer
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-		invoke-rc.d --force postgresql restart || true
-	else
-		/etc/init.d/postgresql restart || true
-	fi
+	restart_postgresql
 
 	# Create the database
 	dbc_go maas $@
@@ -234,28 +264,62 @@
 	db_input high maas/installation-note || true
 	db_go
 
+elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+	# Set the IP address of the interface with default route
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	db_set maas/default-maas-url "$ipaddr"
+	if [ -n "$ipaddr" ]; then
+		configure_maas_default_url "$ipaddr"
+	fi
+	restart_cobbler
+
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
 	# If upgrading to any later package version, then upgrade db.
 	if [ -x /usr/sbin/invoke-rc.d ]; then
 		invoke-rc.d apache2 stop || true
 	fi
 
+	# make sure postgresql is running
+	restart_postgresql
+
 	# If upgrading from any version lower than 0.1+bzr445+dfsg-0ubuntu1
 	# we need to update the user/group.
 	if dpkg --compare-versions "$2" lt 0.1+bzr445+dfsg-0ubuntu1; then
+		# add user/group
 		add_user_group
+		# set correct permissions
 		chown -R maas:maas /var/lib/maas/
 		chown -R maas:maas /var/log/maas
 		chown -R syslog:syslog /var/log/maas/rsyslog
+	fi
+	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+bzr462+dfsg-0ubuntu1
+	# we need to regenerate the passwords and update configs.
+	if dpkg --compare-versions "$2" lt 0.1+bzr473+dfsg-0ubuntu1; then
+		# configure maas user for cobbler
 		configure_maas_cobbler_user
+		# configure pserv user for cobbler
 		configure_maas_pserv_user
+		# configure maas default url
+		db_get maas/default-maas-url
+		ipaddr="$RET"
+		# If nothing in the database, obtain the IP from cobbler settings
+		# which is the same as MAAS_DEFAULT_URL
+		if [ -z "$ipaddr" ]; then
+			ipaddr=$(awk '$1 == "server:" { print $2 }' /etc/cobbler/settings)
+			db_set maas/default-maas-url "$ipaddr"
+		fi
+		configure_maas_default_url "$ipaddr"
+		# make sure rabbitmq is running
+		restart_rabbitmq
 		configure_maas_txlongpoll_rabbitmq_user
+		# handle database upgrade
 		dbc_go maas $@
 		configure_maas_database "$dbc_dbpass"
 	fi
-	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
-		configure_maas_tgt
-	fi
 
 	maas_sync_migrate_db
 	restart_apache2
 
=== modified file 'debian/maas.templates'
--- debian/maas.templates	2012-04-04 18:52:33 +0000
+++ debian/maas.templates	2012-04-18 06:50:39 +0000
@@ -6,3 +6,17 @@
  can access the MAAS Web interface here:
  .
     http://${MAAS_URL}/MAAS
+ .
+ If the automatically detected address above is not in the same
+ network as the MAAS clients, you need to reconfigure it:
+ .
+    sudo dpkg-reconfigure maas
+
+Template: maas/default-maas-url
+Type: string
+_Description: Ubuntu MAAS PXE/Provisioning network address:
+ The Ubuntu MAAS Server automatically detects the IP address
+ that is used for PXE and provisioning. However, it needs to be
+ in the same network as the clients. If the automatically
+ detected address is not in the same network as the clients, it
+ must be changed.