projects / mirror / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Kill planet.debian.net (RT#7019)
[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb
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 ad829e2..fe78e49 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,15 +4,54 @@
 # deb.debian.org
 <% if scope.function_has_static_component(['deb.debian.org']) -%>
 <Macro vstatic-vhost-extra-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/
+       ServerAlias httpredir.debian.org
+       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
 </Macro>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName deb.debian.org
+
+       ErrorLog /var/log/apache2/deb.debian.org-error.log
+       CustomLog /var/log/apache2/deb.debian.org-access.log privacyssl
+
+       Use common-debian-service-ssl deb.debian.org
+       Use common-ssl-HSTS
+
+       ServerAdmin debian-admin@lists.debian.org
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       ServerSignature On
+
+       DocumentRoot /srv/static.debian.org/mirrors/deb.debian.org/cur
+       <Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
+               AllowOverride FileInfo Indexes Options=Multiviews
+               Options Indexes SymLinksIfOwnerMatch
+               Require all granted
+       </Directory>
+
+       Header set Surrogate-Key <%= @hostname %>
+
+       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
+</VirtualHost>
 <% end -%>
 
 <Macro vstatic-vhost-extra-network-test.debian.org>
        ServerAlias network-test-backend.debian.org
+       <Location /nm>
+               Header set Cache-Control "must-revalidate, max-age=0"
+       </Location>
 </Macro>
 
 <Macro vstatic-vhost-extra-bits.debian.org>
@@ -23,6 +62,12 @@
 
 <Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
        AddDefaultCharset utf-8
+
+       # Rewrite away double slashes
+       RewriteEngine on
+       RewriteCond %{REQUEST_URI} ^(.*)//(.*)$ [NC]
+       RewriteRule . %1/%2 [R=301,L,NE]
+
        <LocationMatch "/changelogs/(main|contrib|non-free)">
                ForceType text/plain
        </LocationMatch>
@@ -36,11 +81,11 @@
        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/
        <Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
                Require all granted
                Options Indexes SymLinksIfOwnerMatch MultiViews
-               IndexOptions FancyIndexing NameWidth=*
 
                AddEncoding gzip .gz
                FilterDeclare gzip CONTENT_SET
@@ -50,6 +95,10 @@
                        ForceType text/plain
                        AddDefaultCharset utf-8
                </Files>
+               <Files *.debdiff.html.gz>
+                       ForceType text/html
+                       AddDefaultCharset utf-8
+               </Files>
        </Directory>
 </Macro>
 
@@ -57,7 +106,6 @@
        <Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Multiviews Indexes FollowSymLinks Includes
-               IndexOptions FancyIndexing NameWidth=*
                Require all granted
        </Directory>
 
@@ -78,10 +126,7 @@
                AddEncoding x-gzip .gz
                AddType text/plain .log
 
-               <IfModule mod_userdir.c>
-                       AddOutputFilterByType DEFLATE image/svg+xml
-                       AddOutputFilterByType DEFLATE text/plain
-               </IfModule>
+               AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css image/svg+xml
        </Directory>
 
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
@@ -103,6 +148,11 @@
        RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE]
        # Versioned request
        RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
+
+       Header always set Content-Security-Policy "default-src 'self'; media-src 'none'; object-src 'none';"
+       <FilesMatch "\.(svg)$">
+               Header always set Content-Security-Policy "default-src 'none'; frame-ancestors 'none'; style-src 'self' 'unsafe-inline';"
+       </FilesMatch>
 </Macro>
 
 <%=
@@ -152,12 +202,17 @@ 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)
+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.net"          , :ssl => true)
+vhost(lines, "micronews.debian.org"          , :ssl => true)
 vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
 
 vhost(lines, "10years.debconf.org"           , :ssl => true)
@@ -170,6 +225,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)
@@ -187,80 +244,153 @@ lines.join("\n")
 # 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.
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerName www.backports.org
        ServerAlias lists.backports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://backports.debian.org/
+       RedirectPermanent / https://backports.debian.org/
 </VirtualHost>
 
 ######################
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerName www.debian-ports.org
        ServerAlias debian-ports.org
        ServerAdmin debian-admin@debian.org
        RedirectPermanent / https://www.ports.debian.org/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerName ports.debian.org
        ServerAlias ports.debian.net
        ServerAdmin debian-admin@debian.org
        RedirectPermanent / https://www.ports.debian.org/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerName incoming.debian-ports.org
        ServerAdmin debian-admin@debian.org
        RedirectPermanent / http://incoming.ports.debian.org/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        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/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<Macro vstatic-vhost-video.debian.net>
        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/
+</Macro>
+
+<VirtualHost <%= @vhost_listen %> >
+       Use vstatic-vhost-video.debian.net
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       Use vstatic-vhost-video.debian.net
+       Use common-debian-service-ssl video.debian.net
+       Use common-ssl-HSTS
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect lists.alioth.debian.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       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/
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect pkg-ruby-extras.alioth.debian.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       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/
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect video.debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       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/
 </VirtualHost>
 
 # historical sites
 ##################
 # now only redirects remain
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        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/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        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/
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerName ftp-master.metadata.debian.org
        ServerAdmin debian-admin@debian.org
        RedirectPermanent / http://metadata.ftp-master.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= @vhost_listen %> >
+       ServerName backports-master.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / https://backports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen %> >
+       ServerName manpages.debian.net
+       ServerAdmin debian-admin@debian.org
+       Redirect / https://manpages.debian.org/
+</VirtualHost>
+
+Use common-dsa-vhost-https-redirect sources.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+       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/
+</VirtualHost>
+
+# error pages
+#############
+
+Use common-dsa-vhost-https-redirect archive.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+       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
+       Use common-disabled-service
+</VirtualHost>
+
+
 # vim:ft=apache:
Unnamed repository; edit this file 'description' to name the repository.