X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdgit%2Fgit.dgit.debian.org;h=fd77f190bc33788a862d32b7f1db83c8335f9a7e;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=80fcd067f7fc8f788776f42a3760a182c20c4ddd;hpb=570aa373d7acb0212f47b8ebda7cd42572f7c9eb;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 80fcd067f..fd77f190b 100644
--- a/modules/roles/files/dgit/git.dgit.debian.org
+++ b/modules/roles/files/dgit/git.dgit.debian.org
@@ -1,14 +1,15 @@
-#Use common-dsa-vhost-https-redirect git.dgit.debian.org
+Use common-debian-service-https-redirect * git.dgit.debian.org
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName git.dgit.debian.org
 	ServerAdmin dgit-owner@debian.org
 
 	ErrorLog /var/log/apache2/git.dgit.debian.org-ssl-error.log
 	CustomLog /var/log/apache2/git.dgit.debian.org-ssl-access.log privacy
 
-	#Use common-debian-service-ssl git.dgit.debian.org
-	#Use common-ssl-HSTS
+	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 @@
 	</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]