X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/011fea433b70c648c6a7697eda0f719a2700cd8a..9791e8b8d9e5b54ad87e5c2623c2f28a5a6f1260:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 7c3dcfac0..607d723b2 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 require "yaml"
+require "securerandom"
 
 include_recipe "apache"
 include_recipe "passenger"
@@ -50,10 +51,11 @@ package "python-psycopg2"
 
 easy_install_package "geojson"
 
+apache_module "env"
 apache_module "expires"
-apache_module "fastcgi-handler"
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"
-apache_module "expires"
 apache_module "wsgi"
 
 gem_package "sqlite3"
@@ -63,7 +65,8 @@ gem_package "rails" do
 end
 
 service "php5-fpm" do
-  action [ :enable, :start ]
+  provider Chef::Provider::Service::Upstart
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -89,7 +92,7 @@ template "/etc/phppgadmin/config.inc.php" do
   mode 0644
 end
 
-link "/etc/apache2/conf.d/phppgadmin" do
+file "/etc/apache2/conf.d/phppgadmin" do
   action :delete
 end
 
@@ -101,88 +104,87 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
-  if ["user","administrator"].include?(details[:status])
-    user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}"
+  next unless %w(user administrator).include?(details[:status])
 
-    if File.directory?("#{user_home}/public_html")
-      template "/etc/php5/fpm/pool.d/#{name}.conf" do
-        source "fpm.conf.erb"
-        owner "root"
-        group "root"
-        mode 0644
-        variables :user => name
-        notifies :reload, "service[php5-fpm]"
-      end
+  user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
 
-      apache_site "#{name}.dev.openstreetmap.org" do
-        template "apache.user.erb"
-        directory "#{user_home}/public_html"
-        variables :user => name
-      end
-    end
+  next unless File.directory?("#{user_home}/public_html")
+
+  port = 7000 + account["uid"].to_i
+
+  template "/etc/php5/fpm/pool.d/#{name}.conf" do
+    source "fpm.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    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"
+    variables :user => name, :port => port
   end
 end
 
 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|
+  node[:dev][:rails].each do |name, details|
+    ruby node[:passenger][:ruby_version]
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"
-    site_aliases = details[:aliases] || []
     rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
 
-    postgresql_database database_name do
-      cluster "9.1/main"
-      owner "apis"
-    end
-
-    postgresql_extension "#{database_name}_btree_gist" do
-      cluster "9.1/main"
-      database database_name
-      extension "btree_gist"
-    end
+    if details[:repository]
+      site_aliases = details[:aliases] || []
+      secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
 
-    rails_port site_name do
-      ruby node[:passenger][:ruby_version]
-      directory rails_directory
-      user "apis"
-      group "apis"
-      repository details[:repository]
-      revision details[:revision]
-      database_port node[:postgresql][:clusters][:"9.1/main"][:port]
-      database_name database_name
-      database_username "apis"
-      run_migrations true
-    end
+      node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
 
-    template "#{rails_directory}/config/initializers/setup.rb" do
-      source "rails.setup.rb.erb"
-      owner "apis"
-      group "apis"
-      mode 0644
-      variables :site => site_name
-      notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
-    end
+      postgresql_database database_name do
+        cluster "9.3/main"
+        owner "apis"
+      end
 
-    apache_site site_name do
-      template "apache.rails.erb"
-      variables :name => site_name, :aliases => site_aliases
-    end
-  end
+      postgresql_extension "#{database_name}_btree_gist" do
+        cluster "9.3/main"
+        database database_name
+        extension "btree_gist"
+      end
 
-  Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |rails_directory|
-    name = File.basename(rails_directory, ".apis.dev.openstreetmap.org")
+      rails_port site_name do
+        ruby node[:passenger][:ruby_version]
+        directory rails_directory
+        user "apis"
+        group "apis"
+        repository details[:repository]
+        revision details[:revision]
+        database_port node[:postgresql][:clusters][:"9.3/main"][:port]
+        database_name database_name
+        database_username "apis"
+        run_migrations true
+      end
 
-    unless node[:dev][:rails].include?(name)
-      database_config = YAML.load_file("#{rails_directory}/config/database.yml")
-      database_name = database_config["production"]["database"]
-      site_name = "#{name}.apis.dev.openstreetmap.org"
+      template "#{rails_directory}/config/initializers/setup.rb" do
+        source "rails.setup.rb.erb"
+        owner "apis"
+        group "apis"
+        mode 0644
+        variables :site => site_name
+        notifies :run, "execute[#{rails_directory}]"
+      end
 
       apache_site site_name do
-        action [ :delete ]
+        template "apache.rails.erb"
+        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+      end
+    else
+      apache_site site_name do
+        action [:delete]
       end
 
       directory rails_directory do
@@ -196,8 +198,10 @@ if node[:postgresql][:clusters][:"9.1/main"]
 
       postgresql_database database_name do
         action :drop
-        cluster "9.1/main"
+        cluster "9.3/main"
       end
+
+      node.normal[:dev][:rails].delete(name)
     end
   end
 
@@ -218,7 +222,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
     template "apache.apis.erb"
   end
 
-  node[:postgresql][:clusters].each do |name,details|
+  node[:postgresql][:clusters].each_key do |name|
     postgresql_munin name do
       cluster name
       database "ALL"