X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=d19ebb81d78ff446d6763e721efb68d3ba15591d;hb=3fa4c08d9e2ac03daa4eef2f51a11b9f3dbb9546;hp=b4ad43b4000512e9106b7b53553481084fed9310;hpb=06d298a3d2ded28fbbc9b816eddee50911be3753;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 b4ad43b40..d19ebb81d 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -1,12 +1,110 @@ # puppet maintained -Use common-static-vhost mozilla.debian.net -Use common-static-vhost backports.debian.org -Use common-static-vhost-publiclog bits.debian.org -Use common-static-vhost news.debian.net -Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8" -Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org" +<%= +def vhost(lines, sn, type=nil, extra=nil) + if scope.function_has_static_component([sn]) + t = 'common-static-vhost' + if type then t += "-#{type}"; end + + e = '' + if extra then e += " #{extra}"; end + + lines << "Use #{t} #{sn}#{e}" + end +end + +lines = [] +vhost(lines, "mozilla.debian.net") +vhost(lines, "backports.debian.org") +vhost(lines, "incoming.debian.org") +vhost(lines, "news.debian.net") +vhost(lines, "debaday.debian.net") +vhost(lines, "debdeltas.debian.net") +vhost(lines, "timeline.debian.net") +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"') +vhost(lines, "security-team.debian.org", "with-extra", '"ServerAlias security-team-backend.debian.org"') +vhost(lines, "d-i.debian.org" , "ssl") +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", "ssl") +vhost(lines, "debconf1.debconf.org", "ssl") +vhost(lines, "debconf2.debconf.org", "ssl") +vhost(lines, "debconf3.debconf.org", "ssl") +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") + +lines.join("\n") +-%> + +###################### +# metadata.ftp-master.debian.org +<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%> + > + ServerName metadata.ftp-master.debian.org + ServerAdmin debian-admin@lists.debian.org + + ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log + CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy + + Use common-static-base metadata.ftp-master.debian.org + AddDefaultCharset utf-8 + + ForceType text/plain + + +<% end -%> + +###################### +# bits.debian.org +<% if scope.function_has_static_component(['bits.debian.org']) -%> + + ServerName bits.debian.org + ServerAdmin debian-admin@lists.debian.org + + ErrorLog /var/log/apache2/bits.debian.org-error.log + + CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo + + + Use common-static-base bits.debian.org + + + > + RewriteEngine on + + RewriteEngine On + RewriteCond %{REQUEST_URI} !^/feeds/ + RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L] + #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L] + + Use static-bits.debian.org-base + CustomLog /var/log/apache2/bits.debian.org-access.log privacy + + + > + Use static-bits.debian.org-base + CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl + + Use common-debian-service-ssl bits.debian.org + Use common-ssl-HSTS + +<% end -%> + +# www.backports.org +################### # www.backports.org is the historical place for the backports # website and archive. It is now a CNAME to backports.debian.org: # redirect http requests. @@ -20,7 +118,69 @@ Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debia RedirectPermanent / http://backports.debian.org/ +###################### +# www.ports.debian.org +<% if scope.function_has_static_component(['www.ports.debian.org']) -%> + > + ServerName www.ports.debian.org + ServerAlias www.ports-backend.debian.org + ServerAdmin debian-admin@lists.debian.org + + ErrorLog /var/log/apache2/www.ports.debian.org-error.log + CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy + + + UserDir disabled + + ServerSignature On + + DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur + + 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 -%> + + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + AddOutputFilter INCLUDES .xhtml + +<% end -%> + + > + 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/ + + + > + ServerName ports.debian.net + ServerAdmin debian-admin@debian.org + RedirectPermanent / http://www.ports.debian.org/ + + +# video.debian.net +################### + > + ServerName video.debian.net + ServerAdmin debian-admin@debian.org + + Redirect / http://meetings-archive.debian.net/pub/debian-meetings/ + + +# historical sites +################## +# now only redirects remain > ServerName women.debian.org ServerAdmin debian-admin@debian.org @@ -37,4 +197,18 @@ Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debia RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press RedirectPermanent /profiles/ http://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/ + + + > + ServerName ftp-master.metadata.debian.org + ServerAdmin debian-admin@debian.org + RedirectPermanent / http://metadata.ftp-master.debian.org/ + + # vim:ft=apache: