Delete the secret_key_base attribute when dropping a dev site

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index f8098faecd7c22b88e946d44ee2288a416429a47..13a6f96326834c9f6438a2a87f9cd1e62598e8ad 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -18,8 +18,10 @@
 #
 
 require "yaml"
 #
 
 require "yaml"

+require "securerandom"

 
 include_recipe "apache"
 
 include_recipe "apache"

+include_recipe "passenger"

 include_recipe "git"
 include_recipe "mysql"
 include_recipe "postgresql"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "postgresql"


@@ -47,21 +49,15 @@ package "python-dateutil"
 package "python-magic"
 package "python-psycopg2"
 
 package "python-magic"
 package "python-psycopg2"
 

+easy_install_package "geojson"
+
+apache_module "env"

 apache_module "expires"
 apache_module "expires"

-apache_module "fastcgi-handler"
+apache_module "proxy"
+apache_module "proxy_fcgi"

 apache_module "rewrite"
 apache_module "rewrite"

-apache_module "expires"

 apache_module "wsgi"
 
 apache_module "wsgi"
 

-apache_module "passenger" do
-  conf "passenger.conf.erb"
-end
-
-munin_plugin "passenger_memory"
-munin_plugin "passenger_processes"
-munin_plugin "passenger_queues"
-munin_plugin "passenger_requests"
-

 gem_package "sqlite3"
 
 gem_package "rails" do
 gem_package "sqlite3"
 
 gem_package "rails" do


@@ -69,6 +65,7 @@ gem_package "rails" do
 end
 
 service "php5-fpm" do
 end
 
 service "php5-fpm" do

+  provider Chef::Provider::Service::Upstart

   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end


@@ -95,7 +92,7 @@ template "/etc/phppgadmin/config.inc.php" do
   mode 0644
 end
 
   mode 0644
 end
 

-link "/etc/apache2/conf.d/phppgadmin" do
+file "/etc/apache2/conf.d/phppgadmin" do

   action :delete
 end
 
   action :delete
 end
 


@@ -106,6 +103,7 @@ end
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}

+  port = 7000 + account["uid"].to_i

 
   if ["user","administrator"].include?(details[:status])
     user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}"
 
   if ["user","administrator"].include?(details[:status])
     user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}"


@@ -116,14 +114,14 @@ search(:accounts, "*:*").each do |account|
         owner "root"
         group "root"
         mode 0644
         owner "root"
         group "root"
         mode 0644

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

         notifies :reload, "service[php5-fpm]"
       end
 
       apache_site "#{name}.dev.openstreetmap.org" do
         template "apache.user.erb"
         directory "#{user_home}/public_html"
         notifies :reload, "service[php5-fpm]"
       end
 
       apache_site "#{name}.dev.openstreetmap.org" do
         template "apache.user.erb"
         directory "#{user_home}/public_html"

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

       end
     end
   end
       end
     end
   end


@@ -131,7 +129,7 @@ end
 
 if node[:postgresql][:clusters][:"9.1/main"]
   postgresql_user "apis" do
 
 if node[:postgresql][:clusters][:"9.1/main"]
   postgresql_user "apis" do

-    cluster "9.1/main"
+    cluster "9.3/main"

   end
 
   node[:dev][:rails].each do |name,details|
   end
 
   node[:dev][:rails].each do |name,details|


@@ -139,26 +137,29 @@ if node[:postgresql][:clusters][:"9.1/main"]
     site_name = "#{name}.apis.dev.openstreetmap.org"
     site_aliases = details[:aliases] || []
     rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
     site_name = "#{name}.apis.dev.openstreetmap.org"
     site_aliases = details[:aliases] || []
     rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"

+    secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
+
+    node.set[:dev][:rails][name][:secret_key_base] = secret_key_base

 
     postgresql_database database_name do
 
     postgresql_database database_name do

-      cluster "9.1/main"
+      cluster "9.3/main"

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

-      cluster "9.1/main"
+      cluster "9.3/main"

       database database_name
       extension "btree_gist"
     end
 
     rails_port site_name do
       database database_name
       extension "btree_gist"
     end
 
     rails_port site_name do

-      ruby node[:dev][:ruby]
+      ruby node[:passenger][:ruby_version]

       directory rails_directory
       user "apis"
       group "apis"
       repository details[:repository]
       revision details[:revision]
       directory rails_directory
       user "apis"
       group "apis"
       repository details[:repository]
       revision details[:revision]

-      database_port node[:postgresql][:clusters][:"9.1/main"][:port]
+      database_port node[:postgresql][:clusters][:"9.3/main"][:port]

       database_name database_name
       database_username "apis"
       run_migrations true
       database_name database_name
       database_username "apis"
       run_migrations true


@@ -175,14 +176,14 @@ if node[:postgresql][:clusters][:"9.1/main"]
 
     apache_site site_name do
       template "apache.rails.erb"
 
     apache_site site_name do
       template "apache.rails.erb"

-      variables :name => site_name, :aliases => site_aliases
+      variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base

     end
   end
 
   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |rails_directory|
     name = File.basename(rails_directory, ".apis.dev.openstreetmap.org")
 
     end
   end
 
   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |rails_directory|
     name = File.basename(rails_directory, ".apis.dev.openstreetmap.org")
 

-    unless node[:dev][:rails].include?(name)
+    unless node[:dev][:rails].include?(name) and node[:dev][:rails][name].include?(:repository)

       database_config = YAML.load_file("#{rails_directory}/config/database.yml")
       database_name = database_config["production"]["database"]
       site_name = "#{name}.apis.dev.openstreetmap.org"
       database_config = YAML.load_file("#{rails_directory}/config/database.yml")
       database_name = database_config["production"]["database"]
       site_name = "#{name}.apis.dev.openstreetmap.org"


@@ -202,8 +203,10 @@ if node[:postgresql][:clusters][:"9.1/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "9.1/main"
+        cluster "9.3/main"

       end
       end

+
+      node[:dev][:rails][name].delete(:secret_key_base)

     end
   end
 
     end
   end