MAAS

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

  1. lp1555308
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 457
Merged at revision: 457
Proposed branch: lp:~andreserl/maas/lp1555308
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 38 lines (+9/-2)
3 files modified
debian/changelog (+4/-2)
debian/extras/99-maas-region-sudoers (+4/-0)
debian/maas-region-controller-min.install (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/lp1555308
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+288849@code.launchpad.net

This proposal supersedes a proposal from 2016-03-12.

Commit message

Add sudoers file for region

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-10 01:51:32 +0000
+++ debian/changelog 2016-03-12 01:55:58 +0000
@@ -1,12 +1,14 @@
1maas (2.0.0~alpha2+bzr4760-0ubuntu1) UNRELEASED; urgency=medium1maas (2.0.0~alpha2+bzr4773-0ubuntu1) UNRELEASED; urgency=medium
22
3 * New usptream release, 2.0.0 bzr 4760 (LP: #1553261).3 * New usptream release, 2.0.0 bzr 4773 (LP: #1553261).
4 * maas-dns Depends: bind9 >= 1:9.10.3.dfsg.P2-5 for better system time.4 * maas-dns Depends: bind9 >= 1:9.10.3.dfsg.P2-5 for better system time.
5 LP: #1553176.5 LP: #1553176.
6 * debian/extras/maas-{region,rack}: Replace maas-region-admin6 * debian/extras/maas-{region,rack}: Replace maas-region-admin
7 and maas-provision, respectively (LP: #1553791)7 and maas-provision, respectively (LP: #1553791)
8 * debian/maas-region-controller.postrm: Correctly handle removal by8 * debian/maas-region-controller.postrm: Correctly handle removal by
9 dbconfig-common. (LP: #1553648)9 dbconfig-common. (LP: #1553648)
10 * debian/extras/99-maas-region-sudoers: Allow running systemctl for
11 bind9 and maas-proxy to support service tracking. (LP: #1555308)
1012
11 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 18:18:52 +010013 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 18:18:52 +0100
1214
1315
=== added file 'debian/extras/99-maas-region-sudoers'
--- debian/extras/99-maas-region-sudoers 1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas-region-sudoers 2016-03-12 01:55:58 +0000
@@ -0,0 +1,4 @@
1maas ALL= NOPASSWD: /bin/systemctl status bind9
2maas ALL= NOPASSWD: /bin/systemctl start bind9
3maas ALL= NOPASSWD: /bin/systemctl status maas-proxy
4maas ALL= NOPASSWD: /bin/systemctl start maas-proxy
05
=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install 2016-03-07 22:01:56 +0000
+++ debian/maas-region-controller-min.install 2016-03-12 01:55:58 +0000
@@ -25,3 +25,4 @@
25debian/extras/20-maas.conf etc/rsyslog.d25debian/extras/20-maas.conf etc/rsyslog.d
26debian/extras/maas_remote_syslog_compress etc/cron.d26debian/extras/maas_remote_syslog_compress etc/cron.d
27debian/extras/99-maas usr/share/maas/conf27debian/extras/99-maas usr/share/maas/conf
28debian/extras/99-maas-region-sudoers etc/sudoers.d

Subscribers

People subscribed via source and target branches

to all changes: