X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f5005ec395d870ace9cc54243dcf79f49150c6ce..adcc3f6e33f061f3bcd8aa6f2870ac0fc772195f:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index 4c7bb9c1c..871f692d9 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -17,6 +17,8 @@ # limitations under the License. # +node.default[:memcached][:ip_address] = node.internal_ipaddress + include_recipe "memcached" include_recipe "apache" include_recipe "web::rails" @@ -41,17 +43,9 @@ apache_site "www.openstreetmap.org" do end service "rails-jobs@storage" do - action [:enable, :start] - supports :restart => true - subscribes :restart, "rails_port[www.openstreetmap.org]" - subscribes :restart, "systemd_service[rails-jobs]" + action [:disable, :stop] end -if node[:web][:primary_cluster] - service "rails-jobs@traces" do - action [:enable, :start] - supports :restart => true - subscribes :restart, "rails_port[www.openstreetmap.org]" - subscribes :restart, "systemd_service[rails-jobs]" - end +service "rails-jobs@traces" do + action [:disable, :stop] end