move pummelzacken to master version of nominatim

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 7a6c8a6c1f0debd0363dc06b2e9e5925bad60f7e..dce003b3da9acf40909b1fce6c902aad16a1f05d 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,22 +6,19 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
-  },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
+  :passenger => {
+    :pool_idle_time => 0
   },
   :web => {
     :status => "online",
-    :database_host => "db"
+    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )