launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+453808@xxxxxxxxxxxxxxxxxx>]

Simone Pelosi has proposed merging ~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master.

Commit message:
Fixed wrong archive dir


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/453808
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master.

diff --git a/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
index 5206c4a..169ff83 100644
--- a/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
+++ b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
@@ -1,13 +1,13 @@
 <VirtualHost *:80>
     ServerName {{ domain_ftpmaster }}
 
-    DocumentRoot {{ archives_dir }}/
+    DocumentRoot {{ archives_dir }}/ubuntu-archive/
 
     CustomLog /var/log/apache2/{{ domain_ftpmaster }}-access.log combined
     ErrorLog /var/log/apache2/{{ domain_ftpmaster }}-error.log
 
 {% for distribution in ("ubuntu", "ubuntu-partner") %}
-    <Directory "{{ archives_dir }}/{{ distribution }}/">
+    <Directory "{{ archives_dir }}/ubuntu-archive/{{ distribution }}/">
         IndexOptions NameWidth=* +SuppressDescription
         Options +Indexes +FollowSymLinks
         IndexIgnore favicon.ico