MAAS

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

  1. packaging.bug-1066935
  2. Merge into packaging
Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 140
Proposed branch: lp:~rvb/maas/packaging.bug-1066935
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 40 lines (+9/-3)
2 files modified
debian/changelog (+3/-1)
debian/maas-dns.postinst (+6/-2)
To merge this branch: bzr merge lp:~rvb/maas/packaging.bug-1066935
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Andres Rodriguez Pending
Review via email: mp+130583@code.launchpad.net

Commit message

Fix permissions and group ownership of file /etc/bind/maas/named.conf.rndc.maas.

Description of the change

I've also proposed this branch to be merged in the packaging.quantal branch:

https://code.launchpad.net/~rvb/maas/packaging.bug-1066935/+merge/130584

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

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 2012-10-18 00:13:26 +0000
3+++ debian/changelog 2012-10-19 15:44:27 +0000
4@@ -1,6 +1,8 @@
5 maas (0.1+bzr1269+dfsg-0ubuntu2) UNRELEASED; urgency=low
6
7- * UNRELEASED
8+ [ Raphaël Badin ]
9+ * debian/maas-dns.postinst: fix permissions and group ownership of
10+ file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
11
12 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 17 Oct 2012 20:12:59 -0400
13
14
15=== modified file 'debian/maas-dns.postinst'
16--- debian/maas-dns.postinst 2012-10-16 12:25:40 +0000
17+++ debian/maas-dns.postinst 2012-10-19 15:44:27 +0000
18@@ -6,7 +6,7 @@
19 maas set_up_dns
20 fi
21
22- # fix permissions
23+ # Fix permissions.
24 if [ -d /etc/bind/maas ]; then
25 chown -R maas:root /etc/bind/maas
26 fi
27@@ -16,8 +16,12 @@
28 if [ -f /etc/bind/maas/rndc.conf.maas ]; then
29 chmod 600 /etc/bind/maas/rndc.conf.maas
30 fi
31+ if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then
32+ chown maas:bind /etc/bind/maas/named.conf.rndc.maas
33+ chmod 640 /etc/bind/maas/named.conf.rndc.maas
34+ fi
35
36- # remove any existing MAAS-related include line from
37+ # Remove any existing MAAS-related include line from
38 # /etc/bind/named.conf.local, then re-add it.
39 sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
40 maas get_named_conf --edit --config_path /etc/bind/named.conf.local

Subscribers

People subscribed via source and target branches