long options are king

[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 ffb1bff..5826517 100644 (file)
--- a/modules/roles/files/dgit/git.dgit.debian.org
+++ b/modules/roles/files/dgit/git.dgit.debian.org
@@ -1,4 +1,4 @@
-Use common-debian-service-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-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
@@ -18,11 +19,9 @@ Use common-debian-service-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-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]