X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ffiles%2Fdgit%2Fgit.dgit.debian.org;h=5826517bd79cbf33502c38c0c0750b5c9bc69582;hb=faf0b00a7b3ef90757b7fcf9dec93c9987383f8a;hp=1adac0de043eaf589228e17928ca503b0bcf97ad;hpb=d34dce7c0f7b41f1264d5ffd69e987262dbee180;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/dgit/git.dgit.debian.org b/modules/roles/files/dgit/git.dgit.debian.org
index 1adac0de0..5826517bd 100644
--- a/modules/roles/files/dgit/git.dgit.debian.org
+++ b/modules/roles/files/dgit/git.dgit.debian.org
@@ -1,4 +1,4 @@
-Use common-dsa-vhost-https-redirect git.dgit.debian.org
+Use common-debian-service-https-redirect * git.dgit.debian.org
 
 <VirtualHost *:443>
 	ServerName git.dgit.debian.org
@@ -9,6 +9,7 @@ Use common-dsa-vhost-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
@@ -18,11 +19,9 @@ Use common-dsa-vhost-https-redirect git.dgit.debian.org
 	<Directory /srv/dgit.debian.org/unpriv/repos>
 		AllowOverride None
 		Options SymlinksIfOwnerMatch Indexes
-		IndexOptions FancyIndexing NameWidth=*
 	</Directory>
 
 	SetEnv GIT_PROJECT_ROOT /srv/dgit.debian.org/unpriv/repos
-	SetEnv GIT_HTTP_EXPORT_ALL
 	AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /srv/dgit.debian.org/unpriv/repos/$1
 	AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/dgit.debian.org/unpriv/repos/$1
 	ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
@@ -32,8 +31,8 @@ Use common-dsa-vhost-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]