Disable SSL for alert manager emails

[chef.git] / cookbooks / trac / templates / default / apache.erb

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index bc58ed276b8d07ff60fa7d701fd06b1c3c4627e3..d462cdd3639b146cbd0fefbc35ce3f8480fcc767 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -1,6 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-requests=5000 threads=25 inactivity-timeout=180
+WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 threads=8 restart-interval=3600 inactivity-timeout=180 graceful-timeout=60 maximum-requests=2000

 
 <VirtualHost *:80>
   ServerName <%= @name %>
 
 <VirtualHost *:80>
   ServerName <%= @name %>


@@ -54,6 +54,9 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
 
   DefineExternalAuth osm pipe /usr/local/bin/trac-authenticate
 
 
   DefineExternalAuth osm pipe /usr/local/bin/trac-authenticate
 

+  # Disable /timeline for now
+  RedirectMatch 410 ^/timeline(.*)$
+

   <Location /login>
     AuthType Basic
     AuthName "OpenStreetMap Trac"
   <Location /login>
     AuthType Basic
     AuthName "OpenStreetMap Trac"