X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3b6c4a7fde47963091251384cbb2749445488cf8..9a3fee3b9f30028f6c0ee703dbf9ce86b4bab17b:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index b96f9291e..f8098faec 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -78,12 +78,12 @@ template "/etc/php5/fpm/pool.d/default.conf" do owner "root" group "root" mode 0644 - notifies :reload, resources(:service => "php5-fpm") + notifies :reload, "service[php5-fpm]" end file "/etc/php5/fpm/pool.d/www.conf" do action :delete - notifies :reload, resources(:service => "php5-fpm") + notifies :reload, "service[php5-fpm]" end package "phppgadmin" @@ -117,7 +117,7 @@ search(:accounts, "*:*").each do |account| group "root" mode 0644 variables :user => name - notifies :reload, resources(:service => "php5-fpm") + notifies :reload, "service[php5-fpm]" end apache_site "#{name}.dev.openstreetmap.org" do @@ -129,7 +129,7 @@ search(:accounts, "*:*").each do |account| end end -if node[:postgresql][:clusters]["9.1/main"] +if node[:postgresql][:clusters][:"9.1/main"] postgresql_user "apis" do cluster "9.1/main" end @@ -158,7 +158,7 @@ if node[:postgresql][:clusters]["9.1/main"] group "apis" repository details[:repository] revision details[:revision] - database_port node[:postgresql][:clusters]["9.1/main"][:port] + database_port node[:postgresql][:clusters][:"9.1/main"][:port] database_name database_name database_username "apis" run_migrations true @@ -170,7 +170,7 @@ if node[:postgresql][:clusters]["9.1/main"] group "apis" mode 0644 variables :site => site_name - notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt") + notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" end apache_site site_name do