Merge remote-tracking branch 'waldi/rsyncd-systemd'

[mirror/dsa-puppet.git] / modules / roles / files / dgit / git.dgit.debian.org

diff --git a/modules/roles/files/dgit/git.dgit.debian.org b/modules/roles/files/dgit/git.dgit.debian.org
index 5745772..fd77f19 100644 (file)
--- a/modules/roles/files/dgit/git.dgit.debian.org
+++ b/modules/roles/files/dgit/git.dgit.debian.org
@@ -9,6 +9,7 @@ Use common-debian-service-https-redirect * git.dgit.debian.org
 
        Use common-debian-service-ssl git.dgit.debian.org
        Use common-ssl-HSTS
+       Use http-pkp-git.dgit.debian.org
 
        <IfModule mod_userdir.c>
                UserDir disabled
@@ -31,8 +32,8 @@ Use common-debian-service-https-redirect * git.dgit.debian.org
        </Directory>
 
        RewriteEngine On
-       RewriteRule ^/$ http://browse.dgit.debian.org/ [L,R=301]
-       RewriteRule ^/git/?$ http://browse.dgit.debian.org/ [L,R=301]
+       RewriteRule ^/$ https://browse.dgit.debian.org/ [L,R=301]
+       RewriteRule ^/git/?$ https://browse.dgit.debian.org/ [L,R=301]
 
        RewriteRule ^/git/ - [L]
        RewriteRule ^/(.*) /git/$1 [PT,L]