Merge lp:~bloodearnest/charms/trusty/conn-check/trunk into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

Proposed by Simon Davy on 2015-09-30
Status: Merged
Approved by: Wes Mason on 2015-10-01
Approved revision: 47
Merged at revision: 48
Proposed branch: lp:~bloodearnest/charms/trusty/conn-check/trunk
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 46 lines (+9/-3)
3 files modified
Makefile (+1/-1)
hooks/hooks.py (+0/-1)
playbook.yaml (+8/-1)
To merge this branch: bzr merge lp:~bloodearnest/charms/trusty/conn-check/trunk
Reviewer Review Type Date Requested Status
Wes Mason (community) 2015-09-30 Approve on 2015-10-01
Review via email: mp+272946@code.launchpad.net

Commit message

Ensure nagios group can always read the config file.

Description of the change

Ensure nagios group can always read the config file.

To post a comment you must log in.
Wes Mason (wesmason) wrote :

lgtm

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    canonical-losas
    ubuntuone-hackers

Unaccepted Authors:

    root <email address hidden>

47. By Simon Davy on 2015-09-30

ensure group read permissions on config file

Wes Mason (wesmason) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-03-09 11:16:15 +0000
3+++ Makefile 2015-09-30 18:26:14 +0000
4@@ -34,7 +34,7 @@
5 touch $(NOSE)
6
7 $(CHARMTOOLS): $(VIRTUALENV)
8- @$(PIP) install charm-tools
9+ @$(PIP) install charm-tools simplejson
10 touch $(CHARMTOOLS)
11
12 $(AMULET): $(VIRTUALENV)
13
14=== modified file 'hooks/hooks.py'
15--- hooks/hooks.py 2015-07-21 09:11:25 +0000
16+++ hooks/hooks.py 2015-09-30 18:26:14 +0000
17@@ -24,7 +24,6 @@
18 executed.
19 """
20 charmhelpers.payload.execd.execd_preinstall()
21- config = charmhelpers.core.hookenv.config()
22 charmhelpers.contrib.ansible.install_ansible_support(
23 from_ppa=False)
24
25
26=== modified file 'playbook.yaml'
27--- playbook.yaml 2015-09-26 21:41:07 +0000
28+++ playbook.yaml 2015-09-30 18:26:14 +0000
29@@ -78,9 +78,16 @@
30 dest: "{{ config_path }}"
31 owner: "{{ user }}"
32 group: "{{ group }}"
33- mode: 0600
34+ mode: 0640
35 when: not (path_provided | bool) and (config_provided | bool)
36
37+ - name: ensure group can read the config when config_path provided
38+ tags:
39+ - config-changed
40+ - conn-check-relation-changed
41+ file: path={{ config_path }} mode=0640 group={{ group }}
42+ when: (path_provided | bool) and not (config_provided | bool)
43+
44 # We only need user/group for the run-check action, as the Nagios user executes checks above
45 - name: create group
46 tags:

Subscribers

People subscribed via source and target branches

to all changes: