Merge lp:~cjwatson/charms/trusty/turnip/allow-rsync into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel

[Colin Watson]

Add configuration to open rsync log access to certain hosts.

Add configuration to open rsync log access to certain hosts.

[William Grant (wgrant)]

It's a little weird that this magically works because of basenode.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2015-04-27 01:59:44 +0000
+++ config.yaml	2015-05-07 16:04:22 +0000
@@ -102,6 +102,10 @@
     description: |
       A list of repository URLs to run end-to-end checks on. Multiple
       entries should be separated by spaces.
+  log_hosts_allow:
+    type: string
+    default: ""
+    description: Hosts that should be allowed to rsync logs.
 
   # apt configuration used by charmhelpers.
   install_sources:

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-04-27 01:59:44 +0000
+++ hooks/services.py	2015-05-07 16:04:22 +0000
@@ -19,6 +19,16 @@
         group=config['code_group'])
 
 
+def render_rsync_template(config):
+    if config['log_hosts_allow']:
+        return helpers.render_template(
+            source='turnip-rsync.j2',
+            target='/etc/rsyncd.d/010-turnip',
+            perms=0o644)
+    else:
+        return lambda _: None
+
+
 def manage():
     if hookenv.hook_name() in ('install', 'upgrade-charm'):
         actions.execd_preinstall('turnip')
@@ -99,6 +109,7 @@
                     source='turnip-logrotate.j2',
                     target='/etc/logrotate.d/turnip',
                     perms=0o644),
+                render_rsync_template(config),
                 ],
             'start': [
                 actions.turnip_service_restart,

=== added file 'templates/turnip-rsync.j2'
--- templates/turnip-rsync.j2	1970-01-01 00:00:00 +0000
+++ templates/turnip-rsync.j2	2015-05-07 16:04:22 +0000
@@ -0,0 +1,8 @@
+
+[turnip-logs]
+  path = {{ base_dir }}/logs
+  comment = Turnip Logs
+  list = false
+  read only = true
+  hosts allow = {{ log_hosts_allow }}
+