X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=git-core-gitweb-httpd.conf;h=51ffd6c57de2a9fe6f1c63297705c6f11c45220e;hb=6fbf4942680df72f15ca07e7ff2bfc22a5ab9d2f;hp=b77928782c4c6e9c1499d3b2aee32ba4f62b3712;hpb=814a047c7767df54a33a664213b4472f7533611e;p=packages%2Fgit-core.git

diff --git a/git-core-gitweb-httpd.conf b/git-core-gitweb-httpd.conf
index b779287..51ffd6c 100644
--- a/git-core-gitweb-httpd.conf
+++ b/git-core-gitweb-httpd.conf
@@ -1,15 +1,33 @@
 <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
 <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>
-SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
+<IfModule mod_env.c>
+	SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
+</IfModule>
 
 #
 # Version 2: gitweb as a handler to whole vhost:
@@ -22,7 +40,15 @@ SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #	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>