X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b09d9f97fea24b4a1f56a97724d13752d6340996..3c507e6a6ce46fced3abc46a5220e48edbd79bbc:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index ef8e2dc77..3dd8473af 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -53,7 +53,8 @@ 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 "wsgi"
 
@@ -64,6 +65,7 @@ gem_package "rails" do
 end
 
 service "php5-fpm" do
+  provider Chef::Provider::Service::Upstart
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
@@ -90,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,6 +103,7 @@ end
 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}"
@@ -111,14 +114,14 @@ search(:accounts, "*:*").each do |account|
         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"
-        variables :user => name
+        variables :user => name, :port => port
       end
     end
   end
@@ -126,7 +129,7 @@ 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|
@@ -139,12 +142,12 @@ if node[:postgresql][:clusters][:"9.1/main"]
     node.set[:dev][:rails][name][:secret_key_base] = secret_key_base
 
     postgresql_database database_name do
-      cluster "9.1/main"
+      cluster "9.3/main"
       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
@@ -156,7 +159,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
       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
@@ -200,8 +203,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.set[:dev][:rails][name].delete(:secret_key_base)
     end
   end