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

[Raphaël Badin]

Update the sudo rule to allow preserving the environment when calling maas-import-pxe-files via sudo. We need this to preserve variables like 'http{,s}_proxy'.

[Gavin Panella (allenap)]

Looks good. As discussed on the call this morning, it's a bug that maas-import-pxe-files runs as root, but we can address that separately.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-13 20:40:07 +0000
+++ debian/changelog	2012-11-21 10:31:20 +0000
@@ -1,6 +1,9 @@
 maas (0.1+bzr1269+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   [ Raphaël Badin ]
+  * 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.
   * debian/maas-dns.postinst: fix permissions and group ownership of
     file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
   * debian/control: Remove the dependency of maas-cluster-controller
 
=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2012-11-05 11:52:52 +0000
+++ debian/extras/99-maas-sudoers	2012-11-21 10:31:20 +0000
@@ -1,3 +1,3 @@
 maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
 maas ALL= NOPASSWD: /usr/sbin/maas-provision
-maas ALL= NOPASSWD: /usr/sbin/maas-import-pxe-files
+maas ALL= NOPASSWD: SETENV: /usr/sbin/maas-import-pxe-files