X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d8672a09ce142d820a6b69261a742ef3f921197e..f3d8422f1c3d8c1e8cf3cc04d9982b8cfb8878c4:/cookbooks/trac/templates/default/apache.erb?ds=sidebyside
diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index 173186de6..199be20d6 100644
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -1,7 +1,5 @@
# DO NOT EDIT - This file is being maintained by Chef
-WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 threads=8 restart-interval=3600 inactivity-timeout=180 graceful-timeout=60 maximum-requests=2000
-
ServerName <%= @name %>
<% @aliases.each do |alias_name| -%>
@@ -46,27 +44,9 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
CustomLog /var/log/apache2/<%= @name %>-access.log combined
ErrorLog /var/log/apache2/<%= @name %>-error.log
- DocumentRoot <%= @directory %>/htdocs
- Alias /robots.txt <%= @directory %>/htdocs/site/robots.txt
- WSGIScriptAlias / <%= @directory %>/cgi-bin/trac.wsgi
-
- WSGIProcessGroup <%= @name %>
-
- DefineExternalAuth osm pipe /usr/local/bin/trac-authenticate
+ RewriteEngine on
+ RewriteMap tickets txt:/srv/trac.openstreetmap.org/tickets.map
+ RewriteRule ^/ticket/(\d+)$ https://github.com/openstreetmap/trac-tickets/issues/${tickets:$1}
-
- AuthType Basic
- AuthName "OpenStreetMap Trac"
- AuthBasicProvider external
- AuthExternal osm
- Require valid-user
-
+ RedirectPermanent / https://github.com/openstreetmap/trac-tickets
-
-/htdocs>
- Require all granted
-
-
-/cgi-bin>
- Require all granted
-