Drop redundant file_column_root attribute

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 849830bc24a9876146c4315ec44b44feaf870023..c1c56e8cffe3d675ba837a7df89b0adb55dd4f9a 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -26,45 +26,54 @@ include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
 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 "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"
 
 
 nodejs_package "svgo"
 

-easy_install_package "geojson"
+python_package "geojson"

 
 apache_module "env"
 apache_module "expires"
 
 apache_module "env"
 apache_module "expires"

+apache_module "headers"

 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"

+apache_module "suexec"
+apache_module "userdir"

 apache_module "wsgi"
 apache_module "wsgi"

-apache_module "headers"
+
+package "apache2-suexec-pristine"

 
 gem_package "sqlite3"
 
 
 gem_package "sqlite3"
 


@@ -72,23 +81,21 @@ gem_package "rails" do
   version "3.0.9"
 end
 
   version "3.0.9"
 end
 

-service "php5-fpm" do
-  provider Chef::Provider::Service::Upstart
+service "php7.0-fpm" do

   action [:enable, :start]
   action [:enable, :start]

-  supports :status => true, :restart => true, :reload => true

 end
 
 end
 

-template "/etc/php5/fpm/pool.d/default.conf" do
+template "/etc/php/7.0/fpm/pool.d/default.conf" do

   source "fpm-default.conf.erb"
   owner "root"
   group "root"
   source "fpm-default.conf.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :reload, "service[php5-fpm]"
+  mode 0o644
+  notifies :reload, "service[php7.0-fpm]"

 end
 
 end
 

-file "/etc/php5/fpm/pool.d/www.conf" do
+file "/etc/php/7.0/fpm/pool.d/www.conf" do

   action :delete
   action :delete

-  notifies :reload, "service[php5-fpm]"
+  notifies :reload, "service[php7.0-fpm]"

 end
 
 package "phppgadmin"
 end
 
 package "phppgadmin"


@@ -97,7 +104,7 @@ template "/etc/phppgadmin/config.inc.php" do
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 file "/etc/apache2/conf.d/phppgadmin" do
 end
 
 file "/etc/apache2/conf.d/phppgadmin" do


@@ -112,7 +119,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
   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}"
 
 
   user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
 


@@ -120,13 +127,13 @@ search(:accounts, "*:*").each do |account|
 
   port = 7000 + account["uid"].to_i
 
 
   port = 7000 + account["uid"].to_i
 

-  template "/etc/php5/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do

     source "fpm.conf.erb"
     owner "root"
     group "root"
     source "fpm.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :user => name, :port => port
     variables :user => name, :port => port

-    notifies :reload, "service[php5-fpm]"
+    notifies :reload, "service[php7.0-fpm]"

   end
 
   apache_site "#{name}.dev.openstreetmap.org" do
   end
 
   apache_site "#{name}.dev.openstreetmap.org" do


@@ -139,14 +146,14 @@ search(:accounts, "*:*").each do |account|
     source "sudoers.user.erb"
     owner "root"
     group "root"
     source "sudoers.user.erb"
     owner "root"
     group "root"

-    mode 0440
+    mode 0o440

     variables :user => name
   end
 end
 
     variables :user => name
   end
 end
 

-if node[:postgresql][:clusters][:"9.3/main"]
+if node[:postgresql][:clusters][:"9.5/main"]

   postgresql_user "apis" do
   postgresql_user "apis" do

-    cluster "9.3/main"
+    cluster "9.5/main"

   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do


@@ -154,7 +161,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
     source "cleanup-assets.erb"
     owner "root"
     group "root"
     source "cleanup-assets.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 
   node[:dev][:rails].each do |name, details|
   end
 
   node[:dev][:rails].each do |name, details|


@@ -169,12 +176,12 @@ if node[:postgresql][:clusters][:"9.3/main"]
       node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
 
       postgresql_database database_name do
       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
         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
         database database_name
         extension "btree_gist"
       end


@@ -186,7 +193,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
         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
         database_name database_name
         database_username "apis"
         run_migrations true


@@ -196,11 +203,16 @@ if node[:postgresql][:clusters][:"9.3/main"]
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"

-        mode 0644
+        mode 0o644

         variables :site => site_name
         notifies :run, "execute[#{rails_directory}]"
       end
 
         variables :site => site_name
         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
       apache_site site_name do
         template "apache.rails.erb"
         variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base


@@ -221,7 +233,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "9.3/main"
+        cluster "9.5/main"

       end
 
       node.normal[:dev][:rails].delete(name)
       end
 
       node.normal[:dev][:rails].delete(name)


@@ -231,14 +243,19 @@ if node[:postgresql][:clusters][:"9.3/main"]
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"
   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"
   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
   end
 
   apache_site "apis.dev.openstreetmap.org" do