MAAS

Merge ~adam-collard/maas:temporal-path-to-config into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. temporal-path-to-config
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 341b8226a2494d0b7d80193258c3cc3d02cd282b
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:temporal-path-to-config
Merge into: maas:master
Diff against target: 25 lines (+8/-0)
2 files modified
debian/extras/99-maas-agent-sudoers (+4/-0)
debian/maas-region-api.postinst (+4/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anton Troyanov Approve
Review via email: mp+453801@code.launchpad.net

Commit message

fix: LP:2039455 add chown to postinst

add sudoers for maas-agent systemctl

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b temporal-path-to-config lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 341b8226a2494d0b7d80193258c3cc3d02cd282b

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/extras/99-maas-agent-sudoers b/debian/extras/99-maas-agent-sudoers
2index a8e915a..3d11daa 100644
3--- a/debian/extras/99-maas-agent-sudoers
4+++ b/debian/extras/99-maas-agent-sudoers
5@@ -1 +1,5 @@
6 maas ALL= NOPASSWD: /usr/sbin/maas-agent
7+maas ALL= NOPASSWD: /bin/systemctl reload maas-agent
8+maas ALL= NOPASSWD: /bin/systemctl restart maas-agent
9+maas ALL= NOPASSWD: /bin/systemctl start maas-agent
10+maas ALL= NOPASSWD: /bin/systemctl status maas-agent
11diff --git a/debian/maas-region-api.postinst b/debian/maas-region-api.postinst
12index aa0d8b2..ea85f53 100755
13--- a/debian/maas-region-api.postinst
14+++ b/debian/maas-region-api.postinst
15@@ -35,6 +35,10 @@ configure_libdir() {
16 chown maas:bind /var/lib/bind/maas
17 chmod 0775 /var/lib/bind/maas
18 fi
19+
20+ if [ -d /var/lib/maas/temporal ]; then
21+ chown maas:maas /var/lib/maas/temporal
22+ fi
23 }
24
25 edit_named_options() {

Subscribers

People subscribed via source and target branches