Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:less-ubuntu-unsafe into ubuntu-mirror-charm:master

[Paul Collins]

do not deploy an rsync module, ssh trigger, or rsync client config for unsafe roles

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

lgtm

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision ac5e43d5d984bb95b9d437e7847d9ffd40f9def4

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 36beb11..2befc02 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -209,10 +209,12 @@ def configure_rsync_client():
 
     cron = juju_header()
     for role in roles[hostname]:
-        config_file = "%s.conf" % role
-        wanted_configs.append(config_file)
         try:
             mirror = conf.mirror_map(role)
+            if mirror["unsafe"]:
+                continue
+            config_file = "%s.conf" % role
+            wanted_configs.append(config_file)
         except ValueError:
             log("CHARM: Missing details - skipping {}".format(role))
         else:
@@ -263,6 +265,8 @@ def configure_rsync_server():
     for role in roles[hostname]:
         try:
             mirror = conf.mirror_map(role)
+            if mirror["unsafe"]:
+                continue
         except ValueError:
             log("CHARM: Missing details - skipping {}".format(role))
             continue
@@ -566,6 +570,8 @@ def configure_triggers():
     for role in roles[hostname]:
         try:
             mirror = conf.mirror_map(role)
+            if mirror["unsafe"]:
+                continue
         except ValueError:
             log("CHARM: Missing details - skipping {}".format(role))
             continue