← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:charm-fix-rebuilds-index into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:charm-fix-rebuilds-index into launchpad:master.

Commit message:
charm: Fix rebuild-test.internal indexes

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

The directory entries in `rebuilds_dir` are actually symlinks into `archives_dir`, so we need to allow Apache access to the latter as well.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-fix-rebuilds-index into launchpad:master.
diff --git a/charm/launchpad-copy-archive-publisher/templates/vhosts/rebuild-test.conf.j2 b/charm/launchpad-copy-archive-publisher/templates/vhosts/rebuild-test.conf.j2
index d4f7b22..6c985ab 100644
--- a/charm/launchpad-copy-archive-publisher/templates/vhosts/rebuild-test.conf.j2
+++ b/charm/launchpad-copy-archive-publisher/templates/vhosts/rebuild-test.conf.j2
@@ -17,5 +17,9 @@
         IndexIgnore favicon.ico
         Require all granted
     </Directory>
+
+    <Directory "{{ archives_dir }}">
+        Require all granted
+    </Directory>
 </VirtualHost>