Add more ssh host keys

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 30d26f9103baf2246a24e09e87e118ff002d9c92..e0366f69ecda6f591f18bfe92a76838e1c2e745c 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -94,7 +94,6 @@ end
 package "apache2-suexec-pristine"
 
 php_fpm "default" do
 package "apache2-suexec-pristine"
 
 php_fpm "default" do

-  port 7000

   pm_max_children 10
   pm_start_servers 4
   pm_min_spare_servers 2
   pm_max_children 10
   pm_start_servers 4
   pm_min_spare_servers 2


@@ -159,10 +158,7 @@ search(:accounts, "*:*").each do |account|
 
   next unless File.directory?("#{user_home}/public_html")
 
 
   next unless File.directory?("#{user_home}/public_html")
 

-  port_number = 7000 + account["uid"].to_i
-

   php_fpm name do
   php_fpm name do

-    port port_number

     user name
     group name
     pm_max_children 10
     user name
     group name
     pm_max_children 10


@@ -193,7 +189,7 @@ search(:accounts, "*:*").each do |account|
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"

-    variables :user => name, :port => port_number
+    variables :user => name

   end
 
   template "/etc/sudoers.d/#{name}" do
   end
 
   template "/etc/sudoers.d/#{name}" do


@@ -205,9 +201,9 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
   end
 end
 

-if node[:postgresql][:clusters][:"12/main"]
+if node[:postgresql][:clusters][:"13/main"]

   postgresql_user "apis" do
   postgresql_user "apis" do

-    cluster "12/main"
+    cluster "13/main"

   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do


@@ -262,17 +258,15 @@ if node[:postgresql][:clusters][:"12/main"]
 
     if details[:repository]
       site_aliases = details[:aliases] || []
 
     if details[:repository]
       site_aliases = details[:aliases] || []

-      secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
-
-      node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
+      secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")

 
       postgresql_database database_name do
 
       postgresql_database database_name do

-        cluster "12/main"
+        cluster "13/main"

         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do

-        cluster "12/main"
+        cluster "13/main"

         database database_name
         extension "btree_gist"
       end
         database database_name
         extension "btree_gist"
       end


@@ -314,9 +308,10 @@ if node[:postgresql][:clusters][:"12/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
         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"
         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"]
         gpx_dir gpx_directory
         log_path "#{log_directory}/rails.log"
         memcache_servers ["127.0.0.1"]


@@ -357,7 +352,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           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
         end
 
         execute "#{cgimap_directory}/configure" do


@@ -366,7 +361,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           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
         end
 
         execute "#{cgimap_directory}/Makefile" do


@@ -375,7 +370,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           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
 
           notifies :restart, "service[cgimap@#{name}]"
         end
 


@@ -385,7 +380,7 @@ if node[:postgresql][:clusters][:"12/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
           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}]"
                     :database_name => database_name,
                     :log_directory => log_directory
           notifies :restart, "service[cgimap@#{name}]"


@@ -449,10 +444,8 @@ if node[:postgresql][:clusters][:"12/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "12/main"
+        cluster "13/main"

       end
       end

-
-      node.normal[:dev][:rails].delete(name)

     end
   end
 
     end
   end