Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:fix-ports-rsync-module-name into ubuntu-mirror-charm:master

[Paul Collins]

add config settings for the rsync module name, in particular setting the ports one correctly

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

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

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

Change successfully merged at revision 5e3f5fc98f801ba724a02c938654476e41d6c574

diff --git a/config.yaml b/config.yaml
index b63c050..8a5039e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -75,6 +75,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_ubuntu_source_url"
+  mirror_ubuntu_rsync_module:
+    default: "ubuntu"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_ubuntu_sync_time:
     default: "ondemand"
     type: string
@@ -123,6 +127,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_releases_source_url"
+  mirror_releases_rsync_module:
+    default: "releases"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_releases_sync_time:
     default: "ondemand"
     type: string
@@ -171,6 +179,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_cloud-images_source_url"
+  mirror_cloud-images_rsync_module:
+    default: "cloud-images"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_cloud-images_sync_time:
     default: "ondemand"
     type: string
@@ -219,6 +231,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_simple-streams_source_url"
+  mirror_simple-streams_rsync_module:
+    default: "simple-streams"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_simple-streams_sync_time:
     default: "ondemand"
     type: string
@@ -267,6 +283,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_cdimage_source_url"
+  mirror_cdimage_rsync_module:
+    default: "cdimage"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_cdimage_sync_time:
     default: "ondemand"
     type: string
@@ -315,6 +335,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_ports_source_url"
+  mirror_ports_rsync_module:
+    default: "ubuntu-ports"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_ports_sync_time:
     default: "ondemand"
     type: string
@@ -363,6 +387,10 @@ options:
     default: '{}'
     type: string
     description: "Optional rsync authentication details for mirror_old-releases_source_url"
+  mirror_old-releases_rsync_module:
+    default: "old-releases"
+    type: string
+    description: "The name of the rsync module for this mirror role"
   mirror_old-releases_sync_time:
     default: "ondemand"
     type: string
diff --git a/hooks/Config.py b/hooks/Config.py
index 0d7918d..eb77b87 100755
--- a/hooks/Config.py
+++ b/hooks/Config.py
@@ -125,7 +125,7 @@ class Config:
             'tmpl_file': str("apache-{}.tmpl".format(base_role)),
         }
         for key in ["name", "aliases", "path", "description", "rsync_log",
-                    "command", "source_url", "rsync_auth",
+                    "command", "source_url", "rsync_auth", "rsync_module",
                     "sync_time", "trigger", "apache_late_extra",
                     "apache_early_extra"]:
             config_key = "mirror_%s_%s" % (base_role, key)
diff --git a/templates/rsync-mirrors-cfg.tmpl b/templates/rsync-mirrors-cfg.tmpl
index c829b99..8820e2e 100644
--- a/templates/rsync-mirrors-cfg.tmpl
+++ b/templates/rsync-mirrors-cfg.tmpl
@@ -1,6 +1,6 @@
 
 #for $target in $targets
-[$target]
+[$targets[$target]["rsync_module"]]
   path = $targets[$target]["path"]
   comment = $targets[$target]["description"]
   list = true