launchpad-reviewers team mailing list archive

[Colin Watson <mp+454659@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-copy-archive-publisher-archives-dir into launchpad:master.

Commit message:
charm: Set archives_dir for copy archive publisher

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This needs to be passed on to the application so that `lp.archivepublisher.config.getPubConfig` (via `lp.archivepublisher.model.publisherconfig.PublisherConfig.absolute_root_dir`) knows to publish archives to the correct place in the filesystem.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-copy-archive-publisher-archives-dir into launchpad:master.

diff --git a/charm/launchpad-copy-archive-publisher/reactive/launchpad-copy-archive-publisher.py b/charm/launchpad-copy-archive-publisher/reactive/launchpad-copy-archive-publisher.py
index 1288bfd..d88c239 100644
--- a/charm/launchpad-copy-archive-publisher/reactive/launchpad-copy-archive-publisher.py
+++ b/charm/launchpad-copy-archive-publisher/reactive/launchpad-copy-archive-publisher.py
@@ -64,6 +64,7 @@ def configure_copy_publish_archives_cronjob(config):
 def configure():
     hookenv.log("Configuring copy-archive-publisher")
     config = get_service_config()
+    config["archives_dir"] = archives_dir()
     config["run_parts_location"] = publisher_parts_dir()
 
     host.mkdir(
diff --git a/charm/launchpad-copy-archive-publisher/templates/launchpad-copy-archive-publisher-lazr.conf.j2 b/charm/launchpad-copy-archive-publisher/templates/launchpad-copy-archive-publisher-lazr.conf.j2
index 2eb43c9..35dfef2 100644
--- a/charm/launchpad-copy-archive-publisher/templates/launchpad-copy-archive-publisher-lazr.conf.j2
+++ b/charm/launchpad-copy-archive-publisher/templates/launchpad-copy-archive-publisher-lazr.conf.j2
@@ -10,6 +10,7 @@
 extends: ../launchpad-db-lazr.conf
 
 [archivepublisher]
+archives_dir: {{ archives_dir }}
 run_parts_location: {{ run_parts_location }}
 
 [signing]