package zsh completion

[packages/git-core.git] / git-core-gitweb-httpd.conf

diff --git a/git-core-gitweb-httpd.conf b/git-core-gitweb-httpd.conf
index 7a14945484f2604470f94ba42f37474baa73c523..51ffd6c57de2a9fe6f1c63297705c6f11c45220e 100644 (file)
--- a/git-core-gitweb-httpd.conf
+++ b/git-core-gitweb-httpd.conf
@@ -1,23 +1,54 @@
 <Directory /usr/share/gitweb>
        AllowOverride None
-       Allow from All
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Directory>
 
 # Version 1 (default): under /cgi-bin/gitweb.cgi address
+Alias /cgi-bin/static/ /usr/share/gitweb/static/
 ScriptAlias /cgi-bin/gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
-Alias /gitweb/ /usr/share/gitweb/
 <Location /cgi-bin/gitweb.cgi>
-       Allow from All
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Location>
+<IfModule mod_env.c>
+       SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
+</IfModule>
 
+#
 # Version 2: gitweb as a handler to whole vhost:
 #<VirtualHost *:80>
 #      ServerName gitweb
 #
-#      Alias /gitweb/ /usr/share/gitweb/
-#      DocumentRoot /usr/lib/cgi-bin/gitweb.cgi
+#      Alias /static /usr/share/gitweb/static
+#      DocumentRoot /usr/lib/cgi-bin
+#      AddHandler cgi-script .cgi
+#      DirectoryIndex gitweb.cgi
 #      <Location />
 #              Options ExecCGI
-#              Allow from All
+#              # Apache 2.x
+#              <IfModule !mod_authz_core.c>
+#                      Order allow,deny
+#                      Allow from all
+#              </IfModule>
+#              # Apache 2.4
+#              <IfModule mod_authz_core.c>
+#                      Require all granted
+#              </IfModule>
 #      </Location>
+#      SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #</VirtualHost>