Merge branch 'query' of https://github.com/stapelberg/dsa-puppet

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 b9df975..4c33fe1 100644 (file)
--- 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: