X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=1479916cd6e29f4c7c72135dcf7d34512d7bea49;hb=a9b74cf4ae86eafe8b17f05266203f46ad587d44;hp=c9c88af894ff2f819793582269145ea648f578f5;hpb=4fc14bac881aec79c74fb4cf743d9a85cf681c4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index c9c88af89..1479916cd 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -3,47 +3,30 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %> >
-        ServerAdmin debian-admin@debian.org
-        ServerName ftp.ports.debian.org
-
-
-        ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log
-        LogLevel warn
-        CustomLog /var/log/apache2/ftp.ports.debian.org-access.log privacy
-
-        RedirectMatch "^/$" /debian-ports/
-
-        Alias /debian-ports /srv/mirrors/debian-ports
-        <Directory /srv/mirrors/debian-ports>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
-        <Directory /srv/mirrors/debian-ports/pool>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </Directory>
-        <Directory /srv/mirrors/debian-ports/dists>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=120"
-                </Files>
-        </Directory>
-        <DirectoryMatch "^/srv/mirrors/debian-ports/dists/.*/by-hash">
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </DirectoryMatch>
-
-        Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
-        <Directory /srv/mirrors/debian-ports-cd>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
+<VirtualHost <%= @vhost_listen %> >
+	ServerAdmin debian-admin@debian.org
+	ServerName ftp.ports.debian.org
+	<% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
+	ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) %>
+	<% end %>
+
+	ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log
+	CustomLog /var/log/apache2/ftp.ports.debian.org-access.log privacy
+
+	RedirectMatch "^/$" /debian-ports/
+
+	Alias /debian-ports <%= @archive_root %>
+	Use ftp-archive <%= @archive_root %>
+
+	Alias /debian-ports-cd <%= @archive_cd_root %>
+	<Directory <%= @archive_cd_root %>>
+		Require all granted
+		Options +Indexes
+		Options +FollowSymLinks
+	</Directory>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
-
-
+# vim:set syn=apache: