mediawiki: Increase timeout for mediawiki-refresh-links again

[chef.git] / roles / web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 500fb437ff3df38b69b586c1564f1fea69fef5dc..985811f59b972d45ffef1bf0067ff712f5d51c99 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -22,7 +22,7 @@ default_attributes(
     }
   },
   :memcached => {
     }
   },
   :memcached => {

-    :memory_limit => 4096
+    :memory_limit => 8192

   },
   :passenger => {
     :max_pool_size => 50
   },
   :passenger => {
     :max_pool_size => 50


@@ -33,14 +33,11 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],

-        :command => "/usr/local/bin/passenger-ruby /srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :command => "/usr/local/bin/deliver-message $local_part",

         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",

-        :path => "/bin:/usr/bin:/usr/local/bin",
-        :environment => {
-          "RAILS_ENV" => "production"
-        }
+        :path => "/bin:/usr/bin:/usr/local/bin"

       }
     }
   }
       }
     }
   }