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

[Simon Davy]

Ensure nagios group can always read the config file.

Ensure nagios group can always read the config file.

[Wes Mason (wesmason)]

lgtm

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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>

[lp:~bloodearnest/charms/trusty/conn-check/trunk]

47. By Simon Davy on 2015-09-30

ensure group read permissions on config file

[Wes Mason (wesmason)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-03-09 11:16:15 +0000
+++ Makefile	2015-09-30 18:26:14 +0000
@@ -34,7 +34,7 @@
 	touch $(NOSE)
 
 $(CHARMTOOLS): $(VIRTUALENV)
-	@$(PIP) install charm-tools
+	@$(PIP) install charm-tools simplejson
 	touch $(CHARMTOOLS)
 
 $(AMULET): $(VIRTUALENV)
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-07-21 09:11:25 +0000
+++ hooks/hooks.py	2015-09-30 18:26:14 +0000
@@ -24,7 +24,6 @@
     executed.
     """
     charmhelpers.payload.execd.execd_preinstall()
-    config = charmhelpers.core.hookenv.config()
     charmhelpers.contrib.ansible.install_ansible_support(
         from_ppa=False)
 
 
=== modified file 'playbook.yaml'
--- playbook.yaml	2015-09-26 21:41:07 +0000
+++ playbook.yaml	2015-09-30 18:26:14 +0000
@@ -78,9 +78,16 @@
         dest: "{{ config_path }}"
         owner: "{{ user }}"
         group: "{{ group }}"
-        mode: 0600
+        mode: 0640
       when: not (path_provided | bool) and (config_provided | bool)
 
+    - name: ensure group can read the config when config_path provided
+      tags:
+        - config-changed
+        - conn-check-relation-changed
+      file: path={{ config_path }} mode=0640 group={{ group }}
+      when: (path_provided | bool) and not (config_provided | bool)
+
     # We only need user/group for the run-check action, as the Nagios user executes checks above
     - name: create group
       tags: