X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..9791e8b8d9e5b54ad87e5c2623c2f28a5a6f1260:/cookbooks/dev/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a724d69c5..607d723b2 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -66,7 +66,7 @@ end
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -103,27 +103,28 @@ end
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
-  port = 7000 + account["uid"].to_i
 
-  if %w(user administrator).include?(details[:status])
-    user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
+  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, :port => port
-        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, :port => port
-      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
 
@@ -133,6 +134,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
   end
 
   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"
     rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
@@ -173,7 +175,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         group "apis"
         mode 0644
         variables :site => site_name
-        notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+        notifies :run, "execute[#{rails_directory}]"
       end
 
       apache_site site_name do
@@ -182,7 +184,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
       end
     else
       apache_site site_name do
-        action [ :delete ]
+        action [:delete]
       end
 
       directory rails_directory do