X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=2107a36bd15141725c7ea793ae32b39fcefb8992;hb=f6a4eb4d0eb7078ffb261191abab23801e12db17;hp=40a4496a2ed251e2c536591798eddc6651d727cc;hpb=e5032b441cd09355ff1b7f8c7b27e75d45fa68c5;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 40a4496a2..2107a36bd 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -99,6 +99,7 @@
ForceType text/html
AddDefaultCharset utf-8
+ AddType text/plain .wml
@@ -155,6 +156,71 @@
+
+
+ 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 +IncludesNOEXEC
+ SSILegacyExprParser on
+ DirectoryIndex index.shtml
+
+
+ AddOutputFilter INCLUDES .shtml
+
+ RewriteEngine On
+ # A few redirects for older debconf sites, so old links work
+ RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L]
+ RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L]
+ RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L]
+ RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L]
+ RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L]
+ RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L]
+ RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L]
+ RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L]
+ RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L]
+ RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L]
+ RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
+
+
<%=
def vhost(lines, sn, kwargs={})
@@ -202,7 +268,6 @@ 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, "dpl.debian.org" , :ssl => true)
vhost(lines, "dsa.debian.org" , :ssl => true)
vhost(lines, "rtc.debian.org" , :ssl => true)
@@ -231,6 +296,8 @@ 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, "www.debconf.org" , :ssl => true, :extra => true)
vhost(lines, "deb.debian.org" , :extra => true)
vhost(lines, "release.debian.org" , :ssl => true, :extra => true)
@@ -339,6 +406,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org
<% end -%>
+Use common-dsa-vhost-https-redirect debconf.org
+ >
+ ServerName debconf.org
+ ServerAdmin debian-admin@debian.org
+ Use common-debian-service-ssl debconf.org
+ Use common-ssl-HSTS
+ Redirect / https://www.debconf.org/
+
+
# historical sites
##################
# now only redirects remain