X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=4c33fe192f850fef140f46112b229344361fcd57;hb=1511fdf6245bda62b05148123b233a196d6b6f4d;hp=b9df97509ff7decf223ecf959dcdc4dc4916e4e8;hpb=f7b6fdd2d515765d88696ced52fb0e7e4dda06c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index b9df97509..4c33fe192 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -328,4 +328,35 @@ lines.join("\n")
 	Redirect / https://manpages.debian.org/
 </VirtualHost>
 
+# error pages
+#############
+
+Use common-dsa-vhost-https-redirect archive.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName archive.debian.net
+	ServerAdmin debian-admin@debian.org
+	ErrorLog /var/log/apache2/archive.debian.net-error.log
+	CustomLog /var/log/apache2/archive.debian.net-access.log privacyssl
+
+	Use common-debian-service-ssl archive.debian.net
+	Use common-ssl-HSTS
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+	ServerSignature On
+
+	DocumentRoot /srv/static.debian.org/puppet/archive.debian.net
+	<Directory /srv/static.debian.org/puppet/archive.debian.net>
+		AllowOverride FileInfo Indexes Options=Multiviews
+		Options Indexes SymLinksIfOwnerMatch
+		Require all granted
+	</Directory>
+
+	RedirectMatch 503 ^/(?!503\.html)
+	ErrorDocument 503 /503.html
+	Header always set Retry-After "18000"
+</VirtualHost>
+
+
 # vim:ft=apache: