Disable SMTP callout verification for telenav.com senders

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

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index de4fb525eefe0cf5ff51a81f4767f8ab3bfa7d9c..010b27ad8a4d9d3d04b8965ce93775f669a6654a 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -24,22 +24,19 @@
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
     </Directory>
 
-    Alias /pool-www/ "<%= @directory %>/website/"
-    <Location /pool-www>
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
+    <% @pools.each do |name,details| -%>
+    Alias /pool-<%= name %>/ "<%= @directory %>/website/"
+    <Location /pool-<%= name %>>
+        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .php
+        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpx
+        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpj
     </Location>
-    Alias /pool-bulk/ "<%= @directory %>/website/"
-    <Location /pool-bulk>
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpj
-    </Location>
-    Redirect 509 /pool-block/
-    ErrorDocument 509 /509.html
+    <% end -%>
+
+    Redirect 420 /pool-block/
+    ErrorDocument 420 /509.html
     <Location /pool-block>
-        ErrorDocument 509 /509.html
+        ErrorDocument 420 /509.html
     </Location>
     Redirect 403 /pool-ban/
     <Location /pool-ban>