Bump cookstyle from 6.20.1 to 6.20.2

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 30d26f9103baf2246a24e09e87e118ff002d9c92..ed190970d91ebee15bce62781364bf32bf794037 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


@@ -262,9 +258,7 @@ 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
         cluster "12/main"
 
       postgresql_database database_name do
         cluster "12/main"


@@ -451,8 +445,6 @@ if node[:postgresql][:clusters][:"12/main"]
         action :drop
         cluster "12/main"
       end
         action :drop
         cluster "12/main"
       end

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

     end
   end
 
     end
   end