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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 2e5e0058f..59fd78603 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -26,10 +26,10 @@ include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 
 package "php"
 package "php-cgi"
-# package "php-cgiwrap"
 package "php-cli"
 package "php-curl"
 package "php-db"
@@ -55,15 +55,19 @@ package "python-gdal"
 
 nodejs_package "svgo"
 
-easy_install_package "geojson"
+python_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 +145,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 +170,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 +187,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
@@ -198,6 +202,11 @@ if node[:postgresql][:clusters][:"9.3/main"]
         notifies :run, "execute[#{rails_directory}]"
       end
 
+      ssl_certificate site_name do
+        domains [site_name] + site_aliases
+        notifies :reload, "service[apache2]"
+      end
+
       apache_site site_name do
         template "apache.rails.erb"
         variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
@@ -218,7 +227,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)
@@ -238,6 +247,11 @@ if node[:postgresql][:clusters][:"9.3/main"]
     mode 0o644
   end
 
+  ssl_certificate "apis.dev.openstreetmap.org" do
+    domains "apis.dev.openstreetmap.org"
+    notifies :reload, "service[apache2]"
+  end
+
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end