X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=cbdeb36ae35546fde3ffc63f305b736a44c2853e;hb=9be737cd0d7bd14bcff3da0a4c465c7e8f8e4b9e;hp=329b1cc1f44dd57a074590864d04365b06fbcd8f;hpb=0342a12549f2af9adbbfd033087fa1a34019d91e;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 329b1cc1f..cbdeb36ae 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -8,10 +8,10 @@
ServerAlias cdn.debian.net
ServerAlias http.debian.net
- Redirect /debian/ http://cdn-fastly.deb.debian.org/debian/
- Redirect /debian-debug/ http://cdn-fastly.deb.debian.org/debian-debug/
- Redirect /debian-ports/ http://cdn-fastly.deb.debian.org/debian-ports/
- Redirect /debian-security/ http://cdn-fastly.deb.debian.org/debian-security/
+ Redirect /debian http://cdn-fastly.deb.debian.org/debian
+ Redirect /debian-debug http://cdn-fastly.deb.debian.org/debian-debug
+ Redirect /debian-ports http://cdn-fastly.deb.debian.org/debian-ports
+ Redirect /debian-security http://cdn-fastly.deb.debian.org/debian-security
>
@@ -40,15 +40,18 @@
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/
+ 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 -%>
ServerAlias network-test-backend.debian.org
+
+ Header set Cache-Control "must-revalidate, max-age=0"
+
@@ -78,6 +81,7 @@
RewriteRule ^/migration/testing.pl /migration/cache/%2/%1.html [PT,L]
RewriteRule ^/migration/testing.pl /migration/cache/_index.html
+ Alias /oldstable-proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
Alias /proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
Require all granted
@@ -208,6 +212,8 @@ vhost(lines, "rtc.debian.org" , :ssl => true)
vhost(lines, "mirror-master.debian.org" , :ssl => true)
vhost(lines, "onion.debian.org" , :ssl => true)
vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true)
+vhost(lines, "planet.debian.net")
+vhost(lines, "cdbuilder-logs.debian.org" , :ssl => true)
vhost(lines, "bits.debian.org" , :ssl => true, :extra => true)
vhost(lines, "micronews.debian.org" , :ssl => true)
@@ -223,6 +229,8 @@ vhost(lines, "debconf5.debconf.org" , :ssl => true)
vhost(lines, "debconf6.debconf.org" , :ssl => true)
vhost(lines, "debconf7.debconf.org" , :ssl => true)
vhost(lines, "debconf16.debconf.org" , :ssl => true)
+vhost(lines, "debconf17.debconf.org" , :ssl => true)
+vhost(lines, "debconf18.debconf.org" , :ssl => true)
vhost(lines, "es.debconf.org" , :ssl => true)
vhost(lines, "fr.debconf.org" , :ssl => true)
vhost(lines, "miniconf10.debconf.org" , :ssl => true)
@@ -244,7 +252,7 @@ lines.join("\n")
ServerName www.backports.org
ServerAlias lists.backports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent / http://backports.debian.org/
+ RedirectPermanent / https://backports.debian.org/
######################
@@ -271,16 +279,26 @@ lines.join("\n")
>
ServerName ftp.debian-ports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent /archive http://www.ports.debian.org
+ RedirectPermanent /archive https://www.ports.debian.org
RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports
- RedirectPermanent /debian-cd http://ftp.ports.debian.org/debian-ports-cd
+ RedirectPermanent /debian-cd https://cdimage.debian.org/cdimage/ports/
RedirectPermanent / http://ftp.ports.debian.org/
- >
+
ServerName video.debian.net
ServerAdmin debian-admin@debian.org
- Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+ Redirect / https://meetings-archive.debian.net/pub/debian-meetings/
+
+
+ >
+ Use vstatic-vhost-video.debian.net
+
+
+ >
+ Use vstatic-vhost-video.debian.net
+ Use common-debian-service-ssl video.debian.net
+ Use common-ssl-HSTS
# historical sites
@@ -290,24 +308,24 @@ lines.join("\n")
ServerName women.debian.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent / http://www.debian.org/women/
-
- RedirectPermanent /about/ http://www.debian.org/women/about
- RedirectPermanent /contact/ http://www.debian.org/women/contact
- RedirectPermanent /faqs/ http://www.debian.org/women/faq
- RedirectPermanent /home/ http://www.debian.org/women/
- RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png
- RedirectPermanent /involvement/ http://www.debian.org/women/participate
- RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
- RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
- RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
+ RedirectPermanent / https://www.debian.org/women/
+
+ RedirectPermanent /about/ https://www.debian.org/women/about
+ RedirectPermanent /contact/ https://www.debian.org/women/contact
+ RedirectPermanent /faqs/ https://www.debian.org/women/faq
+ RedirectPermanent /home/ https://www.debian.org/women/
+ RedirectPermanent /images/dw.png https://www.debian.org/women/dw.png
+ RedirectPermanent /involvement/ https://www.debian.org/women/participate
+ RedirectPermanent /mentoring/ https://www.debian.org/women/mentoring
+ RedirectPermanent /press/ https://wiki.debian.org/DebianWomen/Press
+ RedirectPermanent /profiles/ https://www.debian.org/women/profiles/
>
ServerName volatile.debian.org
ServerAlias volatile-master.debian.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent / http://www.debian.org/volatile/
+ RedirectPermanent / https://www.debian.org/volatile/
>
@@ -328,34 +346,27 @@ lines.join("\n")
Redirect / https://manpages.debian.org/
+Use common-dsa-vhost-https-redirect sources.debian.net
+ >
+ ServerName sources.debian.net
+ ServerAdmin debian-admin@debian.org
+ Use common-debian-service-ssl sources.debian.net
+ Use common-ssl-HSTS
+ Redirect permanent / https://sources.debian.org/
+
+
# error pages
#############
Use common-dsa-vhost-https-redirect archive.debian.net
- >
+ >
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
-
-
- UserDir disabled
-
- ServerSignature On
-
- DocumentRoot /srv/static.debian.org/puppet/archive.debian.net
-
- AllowOverride FileInfo Indexes Options=Multiviews
- Options Indexes SymLinksIfOwnerMatch
- Require all granted
-
-
- RedirectMatch 503 ^/(?!503\.html)
- ErrorDocument 503 /503.html
- Header always set Retry-After "18000"
+ Use common-disabled-service