X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/56fcbc5d4f195f3973c08a2155037ec9103c1c01..22d4d76204611d2dd46ef62a0f6f7f1fbf78987d:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index e33c3b230..e0366f69e 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -201,9 +201,9 @@ search(:accounts, "*:*").each do |account| end end -if node[:postgresql][:clusters][:"12/main"] +if node[:postgresql][:clusters][:"13/main"] postgresql_user "apis" do - cluster "12/main" + cluster "13/main" end template "/usr/local/bin/cleanup-rails-assets" do @@ -260,15 +260,13 @@ if node[:postgresql][:clusters][:"12/main"] site_aliases = details[:aliases] || [] secret_key_base = persistent_token("dev", "rails", name, "secret_key_base") - node.rm_normal(:dev, :rails, name) - postgresql_database database_name do - cluster "12/main" + cluster "13/main" owner "apis" end postgresql_extension "#{database_name}_btree_gist" do - cluster "12/main" + cluster "13/main" database database_name extension "btree_gist" end @@ -310,9 +308,10 @@ if node[:postgresql][:clusters][:"12/main"] group "apis" repository details[:repository] revision details[:revision] - database_port node[:postgresql][:clusters][:"12/main"][:port] + database_port node[:postgresql][:clusters][:"13/main"][:port] database_name database_name database_username "apis" + email_from "OpenStreetMap " gpx_dir gpx_directory log_path "#{log_directory}/rails.log" memcache_servers ["127.0.0.1"] @@ -353,7 +352,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "git[#{cgimap_directory}]", :immediate + subscribes :run, "git[#{cgimap_directory}]", :immediately end execute "#{cgimap_directory}/configure" do @@ -362,7 +361,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediate + subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately end execute "#{cgimap_directory}/Makefile" do @@ -371,7 +370,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate + subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately notifies :restart, "service[cgimap@#{name}]" end @@ -381,7 +380,7 @@ if node[:postgresql][:clusters][:"12/main"] group "root" mode "640" variables :cgimap_port => cgimap_port, - :database_port => node[:postgresql][:clusters][:"12/main"][:port], + :database_port => node[:postgresql][:clusters][:"13/main"][:port], :database_name => database_name, :log_directory => log_directory notifies :restart, "service[cgimap@#{name}]" @@ -445,7 +444,7 @@ if node[:postgresql][:clusters][:"12/main"] postgresql_database database_name do action :drop - cluster "12/main" + cluster "13/main" end end end