Fix typo in prometheus readme

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 7ad5eafcb711255d2aaf58d487de5be79e4c4578..ed190970d91ebee15bce62781364bf32bf794037 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -44,14 +44,13 @@ package %w[
   php-sqlite3
   pngcrush
   pngquant
   php-sqlite3
   pngcrush
   pngquant

-  python
-  python-argparse
-  python-beautifulsoup
-  python-cheetah
-  python-dateutil
-  python-magic
-  python-psycopg2
-  python-gdal
+  python3
+  python3-bs4
+  python3-cheetah
+  python3-dateutil
+  python3-magic
+  python3-psycopg2
+  python3-gdal

   g++
   gcc
   make
   g++
   gcc
   make


@@ -75,7 +74,9 @@ package %w[
 
 nodejs_package "svgo"
 
 
 nodejs_package "svgo"
 

-python_package "geojson"
+python_package "geojson" do
+  python_version "3"
+end

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


@@ -85,12 +86,18 @@ apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "suexec"
 apache_module "userdir"
 apache_module "rewrite"
 apache_module "suexec"
 apache_module "userdir"

-apache_module "wsgi"
+
+apache_module "wsgi" do
+  package "libapache2-mod-wsgi-py3"
+end

 
 package "apache2-suexec-pristine"
 
 php_fpm "default" do
 
 package "apache2-suexec-pristine"
 
 php_fpm "default" do

-  template "fpm-default.conf.erb"
+  pm_max_children 10
+  pm_start_servers 4
+  pm_min_spare_servers 2
+  pm_max_spare_servers 6

 end
 
 php_fpm "www" do
 end
 
 php_fpm "www" do


@@ -100,14 +107,14 @@ end
 directory "/srv/dev.openstreetmap.org" do
   owner "root"
   group "root"
 directory "/srv/dev.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/dev.openstreetmap.org/index.html" do
   source "dev.html.erb"
   owner "root"
   group "root"
 end
 
 template "/srv/dev.openstreetmap.org/index.html" do
   source "dev.html.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 ssl_certificate "dev.openstreetmap.org" do
 end
 
 ssl_certificate "dev.openstreetmap.org" do


@@ -125,7 +132,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 0o644
+  mode "644"

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


@@ -151,11 +158,27 @@ search(:accounts, "*:*").each do |account|
 
   next unless File.directory?("#{user_home}/public_html")
 
 
   next unless File.directory?("#{user_home}/public_html")
 

-  port = 7000 + account["uid"].to_i
-

   php_fpm name do
   php_fpm name do

-    template "fpm.conf.erb"
-    variables :user => name, :port => port
+    user name
+    group name
+    pm_max_children 10
+    pm_start_servers 4
+    pm_min_spare_servers 2
+    pm_max_spare_servers 6
+    pm_max_requests 10000
+    request_terminate_timeout 1800
+    environment "HOSTNAME" => "$HOSTNAME",
+                "PATH" => "/usr/local/bin:/usr/bin:/bin",
+                "TMP" => "/tmp",
+                "TMPDIR" => "/tmp",
+                "TEMP" => "/tmp"
+    php_values "max_execution_time" => "300",
+               "memory_limit" => "128M",
+               "post_max_size" => "32M",
+               "upload_max_filesize" => "32M"
+    php_admin_values "sendmail_path" => "/usr/sbin/sendmail -t -i -f #{name}@errol.openstreetmap.org",
+                     "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/"
+    php_flags "display_errors" => "on"

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


@@ -166,14 +189,14 @@ search(:accounts, "*:*").each do |account|
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"

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

   end
 
   template "/etc/sudoers.d/#{name}" do
     source "sudoers.user.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/sudoers.d/#{name}" do
     source "sudoers.user.erb"
     owner "root"
     group "root"

-    mode 0o440
+    mode "440"

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


@@ -188,7 +211,7 @@ if node[:postgresql][:clusters][:"12/main"]
     source "cleanup-assets.erb"
     owner "root"
     group "root"
     source "cleanup-assets.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 
   ruby_version = node[:passenger][:ruby_version]
   end
 
   ruby_version = node[:passenger][:ruby_version]


@@ -235,9 +258,7 @@ if node[:postgresql][:clusters][:"12/main"]
 
     if details[:repository]
       site_aliases = details[:aliases] || []
 
     if details[:repository]
       site_aliases = details[:aliases] || []

-      secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
-
-      node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
+      secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")

 
       postgresql_database database_name do
         cluster "12/main"
 
       postgresql_database database_name do
         cluster "12/main"


@@ -253,31 +274,31 @@ if node[:postgresql][:clusters][:"12/main"]
       directory site_directory do
         owner "apis"
         group "apis"
       directory site_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory log_directory do
         owner "apis"
         group "apis"
       end
 
       directory log_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory gpx_directory do
         owner "apis"
         group "apis"
       end
 
       directory gpx_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory "#{gpx_directory}/traces" do
         owner "apis"
         group "apis"
       end
 
       directory "#{gpx_directory}/traces" do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory "#{gpx_directory}/images" do
         owner "apis"
         group "apis"
       end
 
       directory "#{gpx_directory}/images" do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       rails_port site_name do
       end
 
       rails_port site_name do


@@ -302,7 +323,7 @@ if node[:postgresql][:clusters][:"12/main"]
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"

-        mode 0o644
+        mode "644"

         variables :site => site_name
         notifies :restart, "rails_port[#{site_name}]"
       end
         variables :site => site_name
         notifies :restart, "rails_port[#{site_name}]"
       end


@@ -356,7 +377,7 @@ if node[:postgresql][:clusters][:"12/main"]
           source "cgimap.environment.erb"
           owner "root"
           group "root"
           source "cgimap.environment.erb"
           owner "root"
           group "root"

-          mode 0o640
+          mode "640"

           variables :cgimap_port => cgimap_port,
                     :database_port => node[:postgresql][:clusters][:"12/main"][:port],
                     :database_name => database_name,
           variables :cgimap_port => cgimap_port,
                     :database_port => node[:postgresql][:clusters][:"12/main"][:port],
                     :database_name => database_name,


@@ -387,7 +408,7 @@ if node[:postgresql][:clusters][:"12/main"]
         source "logrotate.apis.erb"
         owner "root"
         group "root"
         source "logrotate.apis.erb"
         owner "root"
         group "root"

-        mode 0o644
+        mode "644"

         variables :name => name,
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
         variables :name => name,
                   :log_directory => log_directory,
                   :rails_directory => rails_directory


@@ -424,22 +445,20 @@ if node[:postgresql][:clusters][:"12/main"]
         action :drop
         cluster "12/main"
       end
         action :drop
         cluster "12/main"
       end

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

     end
   end
 
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"
     end
   end
 
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"

-    mode 0o755
+    mode "755"

   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 0o644
+    mode "644"

   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do
   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do


@@ -462,17 +481,17 @@ end
 directory "/srv/ooc.openstreetmap.org" do
   owner "root"
   group "root"
 directory "/srv/ooc.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_directory "/srv/ooc.openstreetmap.org/html" do
   source "ooc"
   owner "root"
   group "root"
 end
 
 remote_directory "/srv/ooc.openstreetmap.org/html" do
   source "ooc"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 ssl_certificate "ooc.openstreetmap.org" do
 end
 
 ssl_certificate "ooc.openstreetmap.org" do