Merge ~pjdc/charm-nrpe/+git/nrpe-charm:no-more-read-only into ~nrpe-charmers/charm-nrpe:master

[Paul Collins]

[Paul Gear (paulgear)]

LGTM

review: Approve

diff --git a/hooks/nrpe_utils.py b/hooks/nrpe_utils.py
index cddbfdb..89f8092 100644
--- a/hooks/nrpe_utils.py
+++ b/hooks/nrpe_utils.py
@@ -50,7 +50,7 @@ def install_charm_files(service_name):
                 '/var/lib/nagios/export/']
     for nag_dir in nag_dirs:
         if not os.path.exists(nag_dir):
-            host.mkdir(nag_dir)
+            host.mkdir(nag_dir, perms=0o755)
     charm_file_dir = os.path.join(hookenv.charm_dir(), 'files')
     charm_plugin_dir = os.path.join(charm_file_dir, 'plugins')
     pkg_plugin_dir = '/usr/lib/nagios/plugins/'
diff --git a/hooks/services.py b/hooks/services.py
index 1c7da4b..9034981 100644
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -54,7 +54,8 @@ def manage():
                 helpers.render_template(
                     source='export_host.cfg.tmpl',
                     target='/var/lib/nagios/export/'
-                           'host__{}.cfg'.format(nag_hostname)
+                           'host__{}.cfg'.format(nag_hostname),
+                    perms=0o644,
                 ),
             ],
             'start': [nrpe_utils.restart_rsync],