stop using virtual resources for ferm::rule

[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 80fcd06..5826517 100644 (file)
--- 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
@@ -18,7 +19,6 @@
        <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
@@ -31,8 +31,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]