Colin Watson has proposed merging
~cjwatson/launchpad:charm-fix-derived-archive-vhost into launchpad:master.
Commit message:
charm: Fix derived.archive.canonical.com vhost config
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/454788
The document root for derived.archive.canonical.com points to an "archives"
subdirectory that includes only some carefully-constructed symlinks that point
into sub-sub-directories of `archives_dir`: for example, `archives/ubuntu-rtm`
is a symlink to `ubuntu-rtm-archive/ubuntu-rtm` (relative to `archives_dir`),
which lets us expose the actual archive contents without exposing all the
temporary data and so on under other subdirectories of `ubuntu-rtm-archive`.
This is all quite historically weird, but let's mimic it so that we can migrate
from the pre-charmed deployment while preserving existing URLs.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:charm-fix-derived-archive-vhost into launchpad:master.
diff --git a/charm/launchpad-copy-archive-publisher/templates/vhosts/derived.conf.j2 b/charm/launchpad-copy-archive-publisher/templates/vhosts/derived.conf.j2
index 1ff9e19..8d00960 100644
--- a/charm/launchpad-copy-archive-publisher/templates/vhosts/derived.conf.j2
+++ b/charm/launchpad-copy-archive-publisher/templates/vhosts/derived.conf.j2
@@ -4,9 +4,9 @@
CustomLog /var/log/apache2/{{ domain_derived_archive }}-access.log combined
ErrorLog /var/log/apache2/{{ domain_derived_archive }}-error.log
- DocumentRoot {{ archives_dir }}
+ DocumentRoot {{ archives_dir }}/archives
- <Directory {{ archives_dir }}>
+ <Directory {{ archives_dir }}/archives>
Options Indexes FollowSymLinks
AllowOverride None
Require all granted
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
