Enable SSL for user sites on the dev server

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index aefd6594d0e8989c99eb74a1eed4633778f59e23..35efa45f71ded8c9694aedb998dbbc0050c4761d 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,41 +20,48 @@
 require "yaml"
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
-
-package "php"
-package "php-cgi"
-package "php-cli"
-package "php-curl"
-package "php-db"
-package "php-fpm"
-package "php-imagick"
-package "php-mcrypt"
-package "php-mysql"
-package "php-pear"
-package "php-pgsql"
-package "php-sqlite3"
-
-package "pngcrush"
-package "pngquant"
-
-package "python"
-package "python-argparse"
-package "python-beautifulsoup"
-package "python-cheetah"
-package "python-dateutil"
-package "python-magic"
-package "python-psycopg2"
-package "python-gdal"
+include_recipe "python"
+
+package %w[
+  php
+  php-cgi
+  php-cli
+  php-curl
+  php-db
+  php-fpm
+  php-imagick
+  php-mcrypt
+  php-mysql
+  php-pear
+  php-pgsql
+  php-sqlite3
+]
+
+package %w[
+  pngcrush
+  pngquant
+]
+
+package %w[
+  python
+  python-argparse
+  python-beautifulsoup
+  python-cheetah
+  python-dateutil
+  python-magic
+  python-psycopg2
+  python-gdal
+]
 
 nodejs_package "svgo"
 
-easy_install_package "geojson"
+python_package "geojson"
 
 apache_module "env"
 apache_module "expires"
@@ -112,7 +119,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
-  next unless %w(user administrator).include?(details[:status])
+  next unless %w[user administrator].include?(details[:status])
 
   user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
 
@@ -129,6 +136,11 @@ search(:accounts, "*:*").each do |account|
     notifies :reload, "service[php7.0-fpm]"
   end
 
+  ssl_certificate "#{name}.dev.openstreetmap.org" do
+    domains ["#{name}.dev.openstreetmap.org", "#{name}.dev.osm.org"]
+    notifies :reload, "service[apache2]"
+  end
+
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"
@@ -198,7 +210,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
         group "apis"
         mode 0o644
         variables :site => site_name
-        notifies :run, "execute[#{rails_directory}]"
+        notifies :restart, "rails_port[#{site_name}]"
       end
 
       ssl_certificate site_name do