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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d5e9cfdc8..494a0ad0f 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,47 +23,58 @@ require "securerandom"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
+include_recipe "memcached"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
-
-package "php"
-package "php-cgi"
-# package "php-cgiwrap"
-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-sqlite"
-
-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"
+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"
 
@@ -88,6 +99,28 @@ file "/etc/php/7.0/fpm/pool.d/www.conf" do
   notifies :reload, "service[php7.0-fpm]"
 end
 
+directory "/srv/dev.openstreetmap.org" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/srv/dev.openstreetmap.org/index.html" do
+  source "dev.html.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+ssl_certificate "dev.openstreetmap.org" do
+  domains "dev.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "dev.openstreetmap.org" do
+  template "apache.dev.erb"
+end
+
 package "phppgadmin"
 
 template "/etc/phppgadmin/config.inc.php" do
@@ -101,6 +134,11 @@ file "/etc/apache2/conf.d/phppgadmin" do
   action :delete
 end
 
+ssl_certificate "phppgadmin.dev.openstreetmap.org" do
+  domains "phppgadmin.dev.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "phppgadmin.dev.openstreetmap.org" do
   template "apache.phppgadmin.erb"
 end
@@ -109,7 +147,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}"
 
@@ -126,6 +164,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"
@@ -141,9 +184,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 +209,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,9 +226,10 @@ 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"
+        memcache_servers ["127.0.0.1"]
         run_migrations true
       end
 
@@ -195,7 +239,12 @@ if node[:postgresql][:clusters][:"9.3/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
+        domains [site_name] + site_aliases
+        notifies :reload, "service[apache2]"
       end
 
       apache_site site_name do
@@ -218,7 +267,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 +287,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
@@ -249,3 +303,31 @@ if node[:postgresql][:clusters][:"9.3/main"]
     end
   end
 end
+
+directory "/srv/ooc.openstreetmap.org" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+remote_directory "/srv/ooc.openstreetmap.org/html" do
+  source "ooc"
+  owner "root"
+  group "root"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o644
+end
+
+ssl_certificate "ooc.openstreetmap.org" do
+  domains ["ooc.openstreetmap.org",
+           "a.ooc.openstreetmap.org",
+           "b.ooc.openstreetmap.org",
+           "c.ooc.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "ooc.openstreetmap.org" do
+  template "apache.ooc.erb"
+end