Merge lp:~rvb/maas/packaging.bug-1083542 into lp:~maas-maintainers/maas/packaging

[Raphaël Badin]

Fix the name of the updated config file in debian/maas-cluster-controller.postinst (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf).

[Raphaël Badin (rvb)]

This needs to be backport to the quantal sru packaging branch.

Also, when the fix for bug 1081212 is backported to the precise sru packaging branch, this also needs to be backported to the precise sru packaging branch.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 00:08:07 +0000
+++ debian/changelog	2012-11-27 12:01:24 +0000
@@ -1,6 +1,9 @@
 maas (0.1+bzr1366+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   [ Raphaël Badin ]
+  * debian/maas-cluster-controller.postinst: Fix the name of the config
+    file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf)
+    (LP: #1083542).
   * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule
     to allow preserving the environment when running
     /usr/sbin/maas-import-pxe-files via sudo.

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-11-22 22:48:32 +0000
+++ debian/maas-cluster-controller.postinst	2012-11-27 12:01:24 +0000
@@ -59,7 +59,7 @@
         HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }')
         # And substitute it in-place in pserv.conf on an indented, non-commented
         # line.
-        sed -ri "s|^([[:space:]]+generator:[[:space:]]+https?://)[^:/]+|\1$HOSTPART|" /etc/maas/pserv.conf
+        sed -ri "s|^([[:space:]]+generator:[[:space:]]+https?://)[^:/]+|\1$HOSTPART|" /etc/maas/pserv.yaml
     fi
 fi