Make archvsync_base create the /etc/ssh/userkeys/archvsync symlink

[mirror/dsa-puppet.git] / modules / roles / templates / apache-archive.debian.org.erb

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 611b27c..e405bb3 100644 (file)
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -10,13 +10,20 @@
        ServerAlias <%= scope.function_onion_global_service_hostname(['archive.debian.org']) %>
        <% end %>
 
-       RedirectMatch "^/$" /debian-archive/
+       #RedirectMatch "^/$" /debian-archive/
+       DocumentRoot <%= archive_root %>/
        Alias /debian-archive/ <%= archive_root %>/
 
        ErrorLog /var/log/apache2/archive.debian.org-error.log
        CustomLog /var/log/apache2/archive.debian.org-access.log privacy
 
-       Use ftp-archive <%= archive_root %>
+       <Directory <%= archive_root %>>
+               Require all granted
+               Options +Indexes +FollowSymLinks
+       </Directory>
+
+       ExpiresActive On
+       ExpiresDefault "access plus 1 day"
 
        <IfModule mod_userdir.c>
                UserDir disabled