X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6d0fd628cfdf5b2e32c656b78ece007752c522f2..45c0862be818c87ac9825ed36a7a2e9d3a1aab7c:/cookbooks/git/templates/default/apache.erb
diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index c7f85c821..07d11a804 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -44,17 +44,42 @@
CustomLog /var/log/apache2/<%= @name %>-access.log combined
ErrorLog /var/log/apache2/<%= @name %>-error.log
- DocumentRoot <%= @directory %>
- HeaderName HEADER
+ SetEnv GIT_PROJECT_ROOT /var/lib/git
+ SetEnv GIT_HTTP_EXPORT_ALL
+ SetEnv GIT_HTTP_MAX_REQUEST_BUFFER 100M
+
+ SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
+
+ # KeepaliveTimeout longer than git config uploadpack.keepalive 5 second default
+ KeepAliveTimeout 20
+
+ RewriteEngine on
+ RewriteRule ^/cgimap\.git.* https://github.com/zerebubuth/openstreetmap-cgimap [QSD,L,R=permanent]
+ RewriteRule ^/planetdump\.git.* https://github.com/openstreetmap/planetdump [QSD,L,R=permanent]
+ RewriteRule ^/gpx-import\.git.* https://github.com/openstreetmap/gpx-import [QSD,L,R=permanent]
+ RewriteRule ^/potlatch2\.git.* https://github.com/openstreetmap/potlatch2 [QSD,L,R=permanent]
+
+ ScriptAlias /public /usr/lib/git-core/git-http-backend/public
+ ScriptAlias /private /usr/lib/git-core/git-http-backend/private
Alias /gitweb /usr/share/gitweb
Alias /git /var/cache/git
- ScriptAlias /gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
+ ScriptAlias / /usr/lib/cgi-bin/gitweb.cgi/
+
+
+ Require all granted
+
+<% unless @private_allowed.empty? -%>
+
+
+ Require ip <%= @private_allowed.sort.join(" ") %>
+
+<% end -%>
- RewriteEngine On
- RewriteRule ^/$ /gitweb.cgi%{REQUEST_URI} [L,PT]
- RewriteRule ^/(.*\.git/(?!/?(HEAD|info|objects|refs)).*)?$ /gitweb.cgi%{REQUEST_URI} [L,PT]
+
+ Require all denied
+
->
- Require all granted
+
+ Options ExecCGI