X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=8821896d66952ff364dfae3a4770edb25e250d64;hb=60afaa8904cb819ceec6b1739d2f220d052feec3;hp=80f0a989e067cfe7aadccda5bd1cb47f70481c1d;hpb=a7c24ac834c72e8ce97d9bcd6c2bd72a092e400e;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 80f0a989e..8821896d6 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,8 +1,17 @@
# puppet maintained
-<% if scope.function_has_static_component(['XXX']) -%>
+######################
+# deb.debian.org
+<% if scope.function_has_static_component(['deb.debian.org']) -%>
+
+ 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/
+
<% end -%>
+
<%=
def vhost(lines, sn, type=nil, extra=nil)
@@ -19,12 +28,13 @@ end
lines = []
vhost(lines, "mozilla.debian.net")
-vhost(lines, "backports.debian.org")
+vhost(lines, "backports.debian.org", "ssl")
vhost(lines, "incoming.debian.org")
-vhost(lines, "news.debian.net")
-vhost(lines, "debaday.debian.net")
+vhost(lines, "incoming.ports.debian.org")
vhost(lines, "debdeltas.debian.net")
-vhost(lines, "timeline.debian.net")
+vhost(lines, "news.debian.net" , "ssl")
+vhost(lines, "debaday.debian.net" , "ssl")
+vhost(lines, "timeline.debian.net" , "ssl")
vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"')
vhost(lines, "blends.debian.org" , "with-extra", '"ServerAlias blends-backend.debian.org"')
vhost(lines, "wnpp-by-tags.debian.net" , "with-extra", '"ServerAlias wnpp-by-tags-backend.debian.org"')
@@ -34,19 +44,20 @@ vhost(lines, "appstream.debian.org", "ssl")
vhost(lines, "dsa.debian.org" , "ssl")
vhost(lines, "rtc.debian.org" , "ssl")
-vhost(lines, "10years.debconf.org")
-vhost(lines, "debconf0.debconf.org")
-vhost(lines, "debconf1.debconf.org")
-vhost(lines, "debconf2.debconf.org")
-vhost(lines, "debconf3.debconf.org")
-vhost(lines, "debconf4.debconf.org")
-vhost(lines, "debconf5.debconf.org")
-vhost(lines, "debconf6.debconf.org")
-vhost(lines, "debconf7.debconf.org")
-vhost(lines, "es.debconf.org")
-vhost(lines, "fr.debconf.org")
-vhost(lines, "miniconf10.debconf.org")
-vhost(lines, "deb.debian.org")
+vhost(lines, "10years.debconf.org" , "ssl")
+vhost(lines, "debconf0.debconf.org", "ssl")
+vhost(lines, "debconf1.debconf.org", "ssl")
+vhost(lines, "debconf2.debconf.org", "ssl")
+vhost(lines, "debconf3.debconf.org", "ssl")
+vhost(lines, "debconf4.debconf.org", "ssl")
+vhost(lines, "debconf5.debconf.org", "ssl")
+vhost(lines, "debconf6.debconf.org", "ssl")
+vhost(lines, "debconf7.debconf.org", "ssl")
+vhost(lines, "es.debconf.org" , "ssl")
+vhost(lines, "fr.debconf.org" , "ssl")
+vhost(lines, "miniconf10.debconf.org" , "ssl")
+
+vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"')
lines.join("\n")
-%>
@@ -114,16 +125,16 @@ lines.join("\n")
ServerName www.backports.org
ServerAlias lists.backports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent /debian/ http://backports.debian.org/debian-backports/
- RedirectPermanent /backports.org/ http://backports.debian.org/debian-backports/
- RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
RedirectPermanent / http://backports.debian.org/
######################
# www.ports.debian.org
<% if scope.function_has_static_component(['www.ports.debian.org']) -%>
- >
+
+Use common-dsa-vhost-https-redirect www.ports.debian.org
+
+ >
ServerName www.ports.debian.org
ServerAlias www.ports-backend.debian.org
ServerAdmin debian-admin@lists.debian.org
@@ -131,6 +142,9 @@ lines.join("\n")
ErrorLog /var/log/apache2/www.ports.debian.org-error.log
CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
+ Use common-debian-service-ssl www.ports.debian.org
+ Use common-ssl-HSTS
+
UserDir disabled
@@ -141,12 +155,7 @@ lines.join("\n")
AllowOverride FileInfo Indexes Options=Multiviews
Options Multiviews Indexes FollowSymLinks Includes
IndexOptions FancyIndexing NameWidth=*
- <% if @lsbmajdistrelease > '7' -%>
- Require all granted
- <% else -%>
- Order allow,deny
- Allow from all
- <% end -%>
+ Require all granted
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@ -158,17 +167,29 @@ lines.join("\n")
ServerName www.debian-ports.org
ServerAlias debian-ports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent /archive/ http://archive.ports.debian.org/archive/
- RedirectPermanent /debian-cd/ http://archive.ports.debian.org/debian-cd/
- RedirectPermanent /debian-snapshot/ http://archive.ports.debian.org/debian-snapshot/
- RedirectPermanent /debian/ http://archive.ports.debian.org/debian/
- RedirectPermanent / http://www.ports.debian.org/
+ RedirectPermanent / https://www.ports.debian.org/
+
+
+ >
+ ServerName ports.debian.org
+ ServerAlias ports.debian.net
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / https://www.ports.debian.org/
+
+
+ >
+ ServerName incoming.debian-ports.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://incoming.ports.debian.org/
>
- ServerName ports.debian.net
+ ServerName ftp.debian-ports.org
ServerAdmin debian-admin@debian.org
- RedirectPermanent / http://www.ports.debian.org/
+ RedirectPermanent /archive http://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 / http://ftp.ports.debian.org/
# video.debian.net