bring nominatim under chef control

[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..add708d69556ab8a393674c7aa7872c120b6a542 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -24,18 +24,15 @@
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
     </Directory>
 
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
     </Directory>
 

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

         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
     </Location>
         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
     </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>
+    <% end -%>
+

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