launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_update into lp:~maas-maintainers/maas/packaging.

Commit message:
debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
instead of isc-dhcp-server (LP: #1055951)

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1055951 in maas (Ubuntu): "maas-dhcp has no sudoers permission to start maas-dhcp-server"
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1055951

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_update/+merge/126350
-- 
https://code.launchpad.net/~andreserl/maas/packaging_update/+merge/126350
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging_update into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-21 16:54:02 +0000
+++ debian/changelog	2012-09-25 23:21:23 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1049+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1063+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release
 
@@ -33,6 +33,8 @@
       Depend on it.
   * debian/rules: Install maas-dhcp-server upstart job.
   * debian/maas.postrm: Remove celery worker rabbitmq user and host.
+  * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
+    instead of isc-dhcp-server (LP: #1055951)
 
   [ Raphael Badin ]
   * Install maas_local_celeryconfig.py in /etc/maas and symlink to

=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2012-09-05 16:40:12 +0000
+++ debian/extras/99-maas-sudoers	2012-09-25 23:21:23 +0000
@@ -1,2 +1,2 @@
-maas ALL= NOPASSWD: /usr/sbin/service isc-dhcp-server restart
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
 maas ALL= NOPASSWD: /usr/sbin/maas-provision

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-09-21 16:54:02 +0000
+++ debian/maas.postinst	2012-09-25 23:21:23 +0000
@@ -268,9 +268,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+bzr1049+dfsg-0ubuntu1
+	# If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr1049+dfsg-0ubuntu1; then
+	if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then
 		# configure maas default url
 		db_get maas/default-maas-url
 		ipaddr="$RET"