Merge remote-tracking branch 'github/pull/426'

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e33c3b230e4d68d728aca6de963f6a92d993fdbd..15e9e7bbf6f1d986d5eb9070dfd5a30053846763 100644 (file)
--- 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 <web@noreply.openstreetmap.org>"
         gpx_dir gpx_directory
         log_path "#{log_directory}/rails.log"
         memcache_servers ["127.0.0.1"]
@@ -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