X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..1325948a4800cc73a8ffe52fbfcc5467152e49b6:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index acea45e17..c93176e25 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,64 +23,95 @@ 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-apc"
-package "php-db"
-package "php-cgiwrap"
-package "php-pear"
-
-package "php5-cgi"
-package "php5-cli"
-package "php5-curl"
-package "php5-fpm"
-package "php5-imagick"
-package "php5-mcrypt"
-package "php5-mysql"
-package "php5-pgsql"
-package "php5-sqlite"
-
-package "python"
-package "python-argparse"
-package "python-beautifulsoup"
-package "python-cheetah"
-package "python-dateutil"
-package "python-magic"
-package "python-psycopg2"
-
-easy_install_package "geojson"
+include_recipe "python"
+
+package %w[
+  php
+  php-cgi
+  php-cli
+  php-curl
+  php-db
+  php-fpm
+  php-imagick
+  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"
+
+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"
 
-gem_package "sqlite3"
-
-gem_package "rails" do
-  version "3.0.9"
-end
+package "apache2-suexec-pristine"
 
-service "php5-fpm" do
-  provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+service "php7.2-fpm" do
+  action [:enable, :start]
 end
 
-template "/etc/php5/fpm/pool.d/default.conf" do
+template "/etc/php/7.2/fpm/pool.d/default.conf" do
   source "fpm-default.conf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :reload, "service[php5-fpm]"
+  mode 0o644
+  notifies :reload, "service[php7.2-fpm]"
 end
 
-file "/etc/php5/fpm/pool.d/www.conf" do
+file "/etc/php/7.2/fpm/pool.d/www.conf" do
   action :delete
-  notifies :reload, "service[php5-fpm]"
+  notifies :reload, "service[php7.2-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"
@@ -89,13 +120,18 @@ template "/etc/phppgadmin/config.inc.php" do
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 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
@@ -103,33 +139,55 @@ end
 search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
+
+  next unless %w[user administrator].include?(details[:status])
+
+  user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
+
+  next unless File.directory?("#{user_home}/public_html")
+
   port = 7000 + account["uid"].to_i
 
-  if ["user", "administrator"].include?(details[:status])
-    user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
-
-    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
+  template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do
+    source "fpm.conf.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    variables :user => name, :port => port
+    notifies :reload, "service[php7.2-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
+  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"
+    variables :user => name, :port => port
+  end
+
+  template "/etc/sudoers.d/#{name}" do
+    source "sudoers.user.erb"
+    owner "root"
+    group "root"
+    mode 0o440
+    variables :user => name
   end
 end
 
-if node[:postgresql][:clusters][:"9.1/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
+    cookbook "web"
+    source "cleanup-assets.erb"
+    owner "root"
+    group "root"
+    mode 0o755
   end
 
   node[:dev][:rails].each do |name, details|
@@ -144,12 +202,12 @@ if node[:postgresql][:clusters][:"9.1/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
@@ -161,9 +219,11 @@ if node[:postgresql][:clusters][:"9.1/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"]
+        csp_enforce true
         run_migrations true
       end
 
@@ -171,18 +231,23 @@ if node[:postgresql][:clusters][:"9.1/main"]
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
-        mode 0644
+        mode 0o644
         variables :site => site_name
-        notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+        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
         template "apache.rails.erb"
-        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+        variables :application_name => name, :aliases => site_aliases, :secret_key_base => secret_key_base
       end
     else
       apache_site site_name do
-        action [ :delete ]
+        action [:delete]
       end
 
       directory rails_directory do
@@ -190,13 +255,13 @@ if node[:postgresql][:clusters][:"9.1/main"]
         recursive true
       end
 
-      file "/etc/cron.daily/rails-#{name}" do
+      file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do
         action :delete
       end
 
       postgresql_database database_name do
         action :drop
-        cluster "9.3/main"
+        cluster "9.5/main"
       end
 
       node.normal[:dev][:rails].delete(name)
@@ -206,14 +271,19 @@ if node[:postgresql][:clusters][:"9.1/main"]
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"
-    mode 0755
+    mode 0o755
   end
 
   template "/srv/apis.dev.openstreetmap.org/index.html" do
     source "apis.html.erb"
     owner "apis"
     group "apis"
-    mode 0644
+    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
@@ -227,3 +297,31 @@ if node[:postgresql][:clusters][:"9.1/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