X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=f3f650277941f2517fc472fa596af135f70af802;hb=f03d2175076a3c06865412f819e6886fc30c6bf6;hp=79bdd920523a809f8082e6929f0f0a4b61f61d5a;hpb=65110a2992a5e87b1142c71b9528ad84f6d47a61;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 79bdd9205..f3f650277 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -9,6 +9,39 @@
Redirect /debian-ports/ http://cdn-fastly.deb.debian.org/debian-ports/
Redirect /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/
+
+ >
+ ServerName deb.debian.org
+
+ ErrorLog /var/log/apache2/deb.debian.org-error.log
+ CustomLog /var/log/apache2/deb.debian.org-access.log privacyssl
+
+ Use common-debian-service-ssl deb.debian.org
+ Use common-ssl-HSTS
+
+ ServerAdmin debian-admin@lists.debian.org
+
+ UserDir disabled
+
+ ServerSignature On
+
+ DocumentRoot /srv/static.debian.org/mirrors/deb.debian.org/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
+ Options Indexes SymLinksIfOwnerMatch
+ IndexOptions FancyIndexing NameWidth=*
+ Require all granted
+
+
+ Header set Surrogate-Key <%= hostname %>
+
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+
+ Redirect /debian/ https://cdn-aws.deb.debian.org/debian/
+ Redirect /debian-debug/ https://cdn-aws.deb.debian.org/debian-debug/
+ Redirect /debian-ports/ https://cdn-aws.deb.debian.org/debian-ports/
+ Redirect /debian-security/ https://cdn-aws.deb.debian.org/debian-security/
+
<% end -%>
@@ -23,6 +56,12 @@
AddDefaultCharset utf-8
+
+ # Rewrite away double slashes
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC]
+ RewriteRule . %1/%2 [R=301,L,NE]
+
ForceType text/plain
@@ -50,6 +89,10 @@
ForceType text/plain
AddDefaultCharset utf-8
+
+ ForceType text/html
+ AddDefaultCharset utf-8
+
@@ -143,8 +186,7 @@ vhost(lines, "incoming.debian.org" , :ssl => true, :ssl_optional => tr
vhost(lines, "incoming.ports.debian.org" , :ssl => true, :ssl_optional => true)
vhost(lines, "debdeltas.debian.net" , :ssl => true, :ssl_optional => true)
vhost(lines, "news.debian.net" , :ssl => true)
-#vhost(lines, "bootstrap.debian.net" , :ssl => true)
-vhost(lines, "bootstrap.debian.net" )
+vhost(lines, "bootstrap.debian.net" , :ssl => true)
vhost(lines, "debaday.debian.net" , :ssl => true)
vhost(lines, "timeline.debian.net" , :ssl => true)
vhost(lines, "network-test.debian.org" , :extra => true)
@@ -153,12 +195,13 @@ vhost(lines, "wnpp-by-tags.debian.net" , :ssl => true)
vhost(lines, "security-team.debian.org" , :ssl => true)
vhost(lines, "d-i.debian.org" , :ssl => true)
vhost(lines, "appstream.debian.org" , :ssl => true)
+vhost(lines, "apt.buildd.debian.org" , :ssl => true)
vhost(lines, "dsa.debian.org" , :ssl => true)
vhost(lines, "rtc.debian.org" , :ssl => true)
vhost(lines, "onion.debian.org" , :ssl => true)
vhost(lines, "bits.debian.org" , :ssl => true, :extra => true)
-vhost(lines, "micronews.debian.net" , :ssl => true)
+vhost(lines, "micronews.debian.org" , :ssl => true)
vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
vhost(lines, "10years.debconf.org" , :ssl => true)
@@ -264,4 +307,10 @@ lines.join("\n")
RedirectPermanent / http://metadata.ftp-master.debian.org/
+ >
+ ServerName backports-master.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / https://backports.debian.org/
+
+
# vim:ft=apache: