Merge ~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master

[Simone Pelosi]

Fixed wrong archive dir

Apache error AH01630 caused by wrong archive dir:
the right folder is `/srv/launchpad/archive/ubuntu-archive/`
instead of `/srv/launchpad/archive`.

[Colin Watson (cjwatson)]

Could you make the commit message slightly more informative, please?

review: Approve

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