X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/904c9868df60d82a048f38227279534abeba4717..11fdc9157c3243a489cd1c5f05b1abd686952555:/cookbooks/dev/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d5e9cfdc8..3c5dafe25 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -29,7 +29,6 @@ include_recipe "postgresql"
 
 package "php"
 package "php-cgi"
-# package "php-cgiwrap"
 package "php-cli"
 package "php-curl"
 package "php-db"
@@ -39,7 +38,7 @@ package "php-mcrypt"
 package "php-mysql"
 package "php-pear"
 package "php-pgsql"
-package "php-sqlite"
+package "php-sqlite3"
 
 package "pngcrush"
 package "pngquant"
@@ -59,11 +58,15 @@ easy_install_package "geojson"
 
 apache_module "env"
 apache_module "expires"
+apache_module "headers"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
+apache_module "suexec"
+apache_module "userdir"
 apache_module "wsgi"
-apache_module "headers"
+
+package "apache2-suexec-pristine"
 
 gem_package "sqlite3"
 
@@ -141,9 +144,9 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
-if node[:postgresql][:clusters][:"9.3/main"]
+if node[:postgresql][:clusters][:"9.5/main"]
   postgresql_user "apis" do
-    cluster "9.3/main"
+    cluster "9.5/main"
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
@@ -166,12 +169,12 @@ if node[:postgresql][:clusters][:"9.3/main"]
       node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
 
       postgresql_database database_name do
-        cluster "9.3/main"
+        cluster "9.5/main"
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
-        cluster "9.3/main"
+        cluster "9.5/main"
         database database_name
         extension "btree_gist"
       end
@@ -183,7 +186,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
-        database_port node[:postgresql][:clusters][:"9.3/main"][:port]
+        database_port node[:postgresql][:clusters][:"9.5/main"][:port]
         database_name database_name
         database_username "apis"
         run_migrations true
@@ -218,7 +221,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
 
       postgresql_database database_name do
         action :drop
-        cluster "9.3/main"
+        cluster "9.5/main"
       end
 
       node.normal[:dev][:rails].delete(name)