allow sysops to modify interwiki table

[chef.git] / cookbooks / web / templates / default / apache.backend.erb

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index c024090b230eb18bda5fda6306d440876112acf5..6ce83af6c2668f461b5c499ea3c1b363c8efc611 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -40,14 +40,16 @@
   PassengerMinInstances 3
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/
   PassengerMinInstances 3
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/

+  PassengerAppGroupName rails
+  SetEnv OPENSTREETMAP_STATUS <%= @status %>

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
   # Get the real remote IP for requests via a trusted proxy
   #
   RemoteIPHeader X-Forwarded-For
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
   # Get the real remote IP for requests via a trusted proxy
   #
   RemoteIPHeader X-Forwarded-For

-  RemoteIPTrustedProxy 146.179.159.160/27

   RemoteIPTrustedProxy 10.0.32.0/24
   RemoteIPTrustedProxy 10.0.32.0/24

+  RemoteIPTrustedProxy 10.0.48.0/24

 
   #
   # Pass authentication related headers to cgimap
 
   #
   # Pass authentication related headers to cgimap