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

Proposed by Andres Rodriguez
Status: Superseded
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
MAAS Maintainers Pending
Review via email: mp+288848@code.launchpad.net

This proposal has been superseded by a proposal from 2016-03-12.

To post a comment you must log in.

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: