launchpad-reviewers team mailing list archive

[Colin Watson <mp+455551@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-ppa-artifactory into launchpad:master.

Commit message:
charm: Add artifactory_base_url option to ppa-publisher

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/455551

This is needed to handle PPAs that are published to Artifactory rather than locally.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-ppa-artifactory into launchpad:master.

diff --git a/charm/launchpad-ppa-publisher/config.yaml b/charm/launchpad-ppa-publisher/config.yaml
index 9829bf2..06336ff 100644
--- a/charm/launchpad-ppa-publisher/config.yaml
+++ b/charm/launchpad-ppa-publisher/config.yaml
@@ -3,6 +3,11 @@ options:
     type: boolean
     default: true
     description: If true, enable jobs that may change the database.
+  artifactory_base_url:
+    type: string
+    default:
+    description:
+      Base URL for publishing suitably-configured archives to Artifactory.
   domain_ppa_private:
     type: string
     default: private-ppa.launchpad.test
diff --git a/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2 b/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
index ffd4330..0ff2443 100644
--- a/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
+++ b/charm/launchpad-ppa-publisher/templates/launchpad-ppa-publisher-lazr.conf.j2
@@ -16,6 +16,9 @@ archives_dir: {{ archives_dir }}
 {{- opt("oval_data_rsync_endpoint", oval_data_rsync_endpoint) }}
 oval_data_root: {{ oval_data_root }}
 
+[artifactory]
+{{- opt("base_url", artifactory_base_url) }}
+
 [personalpackagearchive]
 root: {{ ppa_archive_root }}
 private_root: {{ ppa_archive_private_root }}