Commit d5b937e3 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: only one url to manage git repositories

parent 2152fefa
...@@ -104,7 +104,7 @@ mode = 0644 ...@@ -104,7 +104,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/httpd_conf.in url = ${:_profile_base_location_}/httpd_conf.in
download-only = true download-only = true
md5sum = 70e9f15d44b799de61135a0d3d7b81e9 md5sum = b2820ee59d2162a98a5ca63ce4b11043
filename = httpd_conf.in filename = httpd_conf.in
mode = 0644 mode = 0644
......
...@@ -84,17 +84,6 @@ RewriteCond %{REQUEST_URI} /git-receive-pack$ ...@@ -84,17 +84,6 @@ RewriteCond %{REQUEST_URI} /git-receive-pack$
RewriteRule ^/git/ - [E=AUTHREQUIRED:yes] RewriteRule ^/git/ - [E=AUTHREQUIRED:yes]
RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes] RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes]
<LocationMatch "^/git-public/">
Order Deny,Allow
Deny from env=AUTHREQUIRED
AuthType Basic
AuthName "Git Access"
AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
Require valid-user
Satisfy any
</LocationMatch>
<LocationMatch "^/git/"> <LocationMatch "^/git/">
Order Deny,Allow Order Deny,Allow
Deny from env=AUTHREQUIRED Deny from env=AUTHREQUIRED
...@@ -103,6 +92,7 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes] ...@@ -103,6 +92,7 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes]
AuthName "Git Access" AuthName "Git Access"
AuthUserFile "{{ parameters.etc_dir }}/.htpasswd" AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
Require valid-user Require valid-user
Satisfy any
</LocationMatch> </LocationMatch>
include {{ parameters.cgi_httpd_conf }} include {{ parameters.cgi_httpd_conf }}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment