Enable planet-notes-dump

[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 8e12362d1f325b4effbf9ed13a76ceeedbf4e3eb..5cdd947bcc3e359704146d60e58ec4e335437168 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -2,13 +2,14 @@
 
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>
 
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>

-    ServerName nominatim.openstreetmap.org
-    ServerAdmin webmaster@openstreetmap.org
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org

     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org

+    ServerAdmin webmaster@openstreetmap.org

 
 <% if port == 443 -%>
     #
 
 <% if port == 443 -%>
     #


@@ -28,36 +29,42 @@
         AddType application/xml   .phpx
         AddType application/json   .phpj
 <% if node[:lsb][:release].to_f >= 14.04 -%>
         AddType application/xml   .phpx
         AddType application/json   .phpj
 <% if node[:lsb][:release].to_f >= 14.04 -%>

-        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
-<% else -%>
-        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
+        Require all granted

 <% end -%>
     </Directory>
 
 <% end -%>
     </Directory>
 

+    <LocationMatch /((?!pool-.*).*\.php[xj]?(/.*)?)$>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
+<% else -%>
+        SetHandler fcgi:/var/run/php5-fpm-www.sock
+<% end -%>
+    </LocationMatch>
+

     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"

-    <Location /pool-<%= name %>>
+    <LocationMatch /pool-<%= name %>/(.*\.php[xj]?(/.*)?)$>

 <% if node[:lsb][:release].to_f >= 14.04 -%>
 <% if node[:lsb][:release].to_f >= 14.04 -%>

-        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
+        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1

 <% else -%>
 <% else -%>

-        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
+        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock

 <% end -%>
 <% end -%>

-    </Location>
+    </LocationMatch>

     <% end -%>
 
     <% end -%>
 

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Redirect 429 /pool-block/
+    ErrorDocument 429 /509.html
+    <Location /pool-block>
+        ErrorDocument 429 /509.html
+    </Location>
+<% else -%>

     Redirect 420 /pool-block/
     ErrorDocument 420 /509.html
     <Location /pool-block>
         ErrorDocument 420 /509.html
     </Location>
     Redirect 420 /pool-block/
     ErrorDocument 420 /509.html
     <Location /pool-block>
         ErrorDocument 420 /509.html
     </Location>

+<% end -%>

     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html