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=7ae70fb878b25f72960512df24fe7c73fb02a224;hb=2750ccc51b2913146b9284aaec444f4ced4b65ec;hp=506f95a7aeac87aeea0250e384907d5e009d6eec;hpb=53787787136a5e947615d5445ad6015074fc2576;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 506f95a7a..7ae70fb87 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
@@ -122,10 +126,7 @@
AddEncoding x-gzip .gz
AddType text/plain .log
-
- AddOutputFilterByType DEFLATE image/svg+xml
- AddOutputFilterByType DEFLATE text/plain
-
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css image/svg+xml
@@ -154,6 +155,55 @@
+
+
+ ForceType text/html
+
+
+ ForceType text/html
+
+
+ RewriteEngine on
+ RewriteRule ^/$ /wiki/Main_Page [L,R=permanent]
+ RewriteRule ^/wiki/$ /wiki/Main_Page [L,R=permanent]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=mediawiki.legacy.commonPrint,shared|skins.monobook(&|$)
+ RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$)
+ RewriteRule ^/load.php$ /load-monobook-styles.css [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=site(&|$)
+ RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$)
+ RewriteRule ^/load.php$ /load-site-styles.css [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=startup(&|$)
+ RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+ RewriteRule ^/load.php$ /load-startup-scripts.js [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=site(&|$)
+ RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+ RewriteRule ^/load.php$ /load-site-scripts.js [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=jquery%2Cmediawiki(&|$)
+ RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+ RewriteRule ^/load.php$ /load-jquery-scripts.js [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=jquery.client%2Ccookie%2CmessageBox%2CmwExtension|mediawiki.legacy.ajax%2Cwikibits|mediawiki.page.startup|mediawiki.util(&|$)
+ RewriteRule ^/load.php$ /load-jquery.client.js [L,QSD]
+
+ RewriteCond %{QUERY_STRING} (^|&)modules=jquery.checkboxShiftClick%2CmakeCollapsible%2Cmw-jump%2Cplaceholder%7Cmediawiki.page.ready%7Cmediawiki.user(&|$)
+ RewriteRule ^/load.php$ /load-jquery.checkbox.js [L,QSD]
+
+
+
+ ServerAlias www-test.debconf.org
+
+
+ Options +Includes
+
+
+ AddOutputFilter INCLUDES .shtml
+
+
<%=
def vhost(lines, sn, kwargs={})
@@ -208,6 +258,7 @@ 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, "cdbuilder-logs.debian.org" , :ssl => true)
vhost(lines, "bits.debian.org" , :ssl => true, :extra => true)
vhost(lines, "micronews.debian.org" , :ssl => true)
@@ -223,9 +274,13 @@ 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, "debconf19.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)
+vhost(lines, "wiki.debconf.org" , :ssl => true, :extra => true)
vhost(lines, "deb.debian.org" , :extra => true)
vhost(lines, "release.debian.org" , :ssl => true, :extra => true)
@@ -244,7 +299,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,18 +326,69 @@ 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
+
+
+Use common-dsa-vhost-https-redirect lists.alioth.debian.org
+ >
+ ServerName lists.alioth.debian.org
+ ServerAdmin debian-admin@debian.org
+ Use common-debian-service-ssl lists.alioth.debian.org
+ Use common-ssl-HSTS
+ Redirect / https://alioth-lists.debian.net/
+
+
+Use common-dsa-vhost-https-redirect pkg-ruby-extras.alioth.debian.org
+ >
+ ServerName pkg-ruby-extras.alioth.debian.org
+ ServerAdmin debian-admin@debian.org
+ Use common-debian-service-ssl pkg-ruby-extras.alioth.debian.org
+ Use common-ssl-HSTS
+ Redirect / https://gemwatch.debian.net/
+Use common-dsa-vhost-https-redirect video.debconf.org
+ >
+ ServerName video.debconf.org
+ ServerAdmin debian-admin@debian.org
+ Use common-debian-service-ssl video.debconf.org
+ Use common-ssl-HSTS
+ Redirect / https://debconf-video-team.pages.debian.net/docs/
+
+
+<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
+ >
+ ServerName metadata.ftp-master.debian.org
+ ServerAlias metadata-backend.ftp-master.debian.org
+ # all self-referential URLs should use the public host name
+ UseCanonicalName On
+ Use common-debian-service-ssl metadata-backend.ftp-master.debian.org
+ ErrorLog /var/log/apache2/metadata-backend.ftp-master.debian.org-error.log
+ CustomLog /var/log/apache2/metadata-backend.ftp-master.debian.org-access.log privacy
+
+ Use static-vhost-base-metadata.ftp-master.debian.org
+
+<% end -%>
+
# historical sites
##################
# now only redirects remain
@@ -290,24 +396,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,6 +434,15 @@ 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
#############
@@ -342,5 +457,50 @@ Use common-dsa-vhost-https-redirect archive.debian.net
Use common-disabled-service
+ >
+ ServerName cdimage.debian.org
+ ServerAlias cloud.debian.org
+ ServerAlias get.debian.org
+ ServerAlias bttracker.debian.org
+ ServerAlias meetings-archive.debian.net
+ ServerAdmin debian-admin@debian.org
+ ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+ CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+
+
+ UserDir disabled
+
+ DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+
+ Require all granted
+
+ RewriteEngine On
+ RewriteRule !^/503.html / [R=503]
+ ErrorDocument 503 /503.html
+
+
+ >
+ ServerName cdimage.debian.org
+ ServerAlias cloud.debian.org
+ ServerAlias get.debian.org
+ ServerAlias bttracker.debian.org
+ ServerAlias meetings-archive.debian.net
+ ServerAdmin debian-admin@debian.org
+ ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+ CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+ Use common-debian-service-ssl cdimage.debian.org
+
+
+ UserDir disabled
+
+ DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+
+ Require all granted
+
+ RewriteEngine On
+ RewriteRule !^/503.html / [R=503]
+ ErrorDocument 503 /503.html
+
+
# vim:ft=apache: