Merge ~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master

[Simone Pelosi]

Added rsync configuration to ftpmaster publisher

According to the legacy deployment of the publisher
we added a configuration file to configure correctly rsync

[Colin Watson (cjwatson)]

review: Needs Fixing

[Colin Watson (cjwatson)]

Before the next attempt at switching over, we'll need to get IS to do a dry-run of the rsync behaviour from their "syncproxy" machines to make sure it all works. But this looks plausible.

review: Approve

[Colin Watson (cjwatson)]

review: Approve

[Simone Pelosi (pelpsi)]

Squashed commits into one

diff --git a/charm/launchpad-ftpmaster-publisher/config.yaml b/charm/launchpad-ftpmaster-publisher/config.yaml
index d871574..8548557 100644
--- a/charm/launchpad-ftpmaster-publisher/config.yaml
+++ b/charm/launchpad-ftpmaster-publisher/config.yaml
@@ -7,14 +7,18 @@ options:
     type: string
     description: Domain name for the published Ubuntu archive.
     default: "archive.ubuntu.test"
-  signing_client_public_key:
+  rsync_secrets:
     type: string
-    description: Public key for encrypting communication between client and signing service. 
+    description: Secrets for rsync
     default: ""
   signing_client_private_key:
     type: string
     description: Private key for encrypting communication between client and signing service. 
     default: ""
+  signing_client_public_key:
+    type: string
+    description: Public key for encrypting communication between client and signing service. 
+    default: ""
   signing_endpoint:
     type: string
     description: Endpoint for the signing service. 
@@ -23,3 +27,19 @@ options:
     type: string
     description: Webmaster contact address.
     default: "[e-mail]"
+  ubuntu_auth_users:
+    type: string
+    description: Authenticated users for rsync ubuntu
+    default: ""
+  ubuntu_dists_hosts_allow:
+    type: string
+    description: IP addresses permitted to connect to ubuntu/dists.
+    default: ""
+  ubuntu_germinate_hosts_allow:
+    type: string
+    description: IP addresses permitted to connect to ubuntu-germinate.
+    default: ""
+  ubuntu_partner_auth_users:
+    type: string
+    description: Authenticated users for rsync ubuntu-partner
+    default: ""
\ No newline at end of file
diff --git a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
index 0342c89..1ccd609 100644
--- a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
+++ b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
@@ -60,6 +60,34 @@ def configure():
     configure_email(config, "launchpad-ftpmaster-publisher")
     configure_logrotate(config)
     configure_cron(config, "crontab.j2")
+    if config["rsync_secrets"]:
+        rsync_secrets_path = "/etc/rsyncd/ftp.secrets"
+        templating.render(
+            "ftp.secrets.j2",
+            rsync_secrets_path,
+            config,
+            perms=0o644,
+        )
+        config["rsync_secrets_path"] = rsync_secrets_path
+    elif os.path.exists("/etc/rsyncd/ftp.secrets"):
+        os.unlink("/etc/rsyncd/ftp.secrets")
+    if (
+        config["ubuntu_auth_users"]
+        and config["ubuntu_partner_auth_users"]
+        and config["ubuntu_dists_hosts_allow"]
+        and config["ubuntu_germinate_hosts_allow"]
+        and config["rsync_secrets_path"]
+    ):
+        templating.render(
+            "020-launchpad-ftpmaster-publisher.conf.j2",
+            "/etc/rsync-juju.d/020-launchpad-ftpmaster-publisher.conf",
+            config,
+            perms=0o644,
+        )
+    elif os.path.exists(
+        "/etc/rsync-juju.d/020-launchpad-ftpmaster-publisher.conf"
+    ):
+        os.unlink("/etc/rsync-juju.d/020-launchpad-ftpmaster-publisher.conf")
     set_state("service.configured")
 
 
diff --git a/charm/launchpad-ftpmaster-publisher/templates/020-launchpad-ftpmaster-publisher.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/020-launchpad-ftpmaster-publisher.conf.j2
new file mode 100644
index 0000000..a730bcb
--- /dev/null
+++ b/charm/launchpad-ftpmaster-publisher/templates/020-launchpad-ftpmaster-publisher.conf.j2
@@ -0,0 +1,32 @@
+max connections = 25
+
+[ftp]
+  path = {{ archives_dir }}/ubuntu-archive/ubuntu
+  comment = Ubuntu Archive
+  list = false
+  read only = true
+  auth users = {{ ubuntu_auth_users }}
+  secrets file = {{ rsync_secrets_path }}
+
+[partner]
+  path = {{ archives_dir }}/ubuntu-archive/ubuntu-partner/
+  comment = Partner
+  list = false
+  read only = true
+  auth users = {{ ubuntu_partner_auth_users }}
+  secrets file = {{ rsync_secrets_path }}
+
+[ubuntu-dists]
+  path = {{ archives_dir }}/ubuntu-archive/ubuntu/dists
+  comment = Ubuntu Archive Dists
+  list = false
+  read only = true
+  hosts allow = {{ ubuntu_dists_hosts_allow }}
+
+[ubuntu-germinate]
+  path = {{ archives_dir }}/ubuntu-archive/ubuntu-germinate
+  comment = Ubuntu Archive Germinate output
+  list = false
+  read only = true
+  hosts allow = {{ ubuntu_germinate_hosts_allow }}
+
diff --git a/charm/launchpad-ftpmaster-publisher/templates/ftp.secrets.j2 b/charm/launchpad-ftpmaster-publisher/templates/ftp.secrets.j2
new file mode 100644
index 0000000..1d38e7d
--- /dev/null
+++ b/charm/launchpad-ftpmaster-publisher/templates/ftp.secrets.j2
@@ -0,0 +1,2 @@
+{{ rsync_secrets }}
+