php: increase minimum base fpm to reasonable limits

[chef.git] / cookbooks / wordpress / resources / site.rb

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index ee934318fa2a57e89ecf181d6d7f71a7f4ff6048..5570fb7b2e997243d711f6f0fb2c052c9d9ad5a8 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -1,8 +1,7 @@
-http
-# Cookbook Name:: wordpress
+# Cookbook:: wordpress

 # Resource:: wordpress_site
 #
 # Resource:: wordpress_site
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -21,33 +20,38 @@ require "securerandom"
 
 default_action :create
 
 
 default_action :create
 

-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true

 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String
 property :database_name, :kind_of => String, :required => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String
 property :database_name, :kind_of => String, :required => true

-property :database_user, :kind_of => String, :required => true
-property :database_password, :kind_of => String, :required => true
+property :database_user, :kind_of => String, :required => [:create]
+property :database_password, :kind_of => String, :required => [:create]

 property :database_prefix, :kind_of => String, :default => "wp_"
 property :database_prefix, :kind_of => String, :default => "wp_"

-property :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false

 property :urls, :kind_of => Hash, :default => {}
 property :urls, :kind_of => Hash, :default => {}

+property :fpm_max_children, :kind_of => Integer, :default => 5
+property :fpm_start_servers, :kind_of => Integer, :default => 2
+property :fpm_min_spare_servers, :kind_of => Integer, :default => 1
+property :fpm_max_spare_servers, :kind_of => Integer, :default => 3
+property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 300
+property :fpm_prometheus_port, :kind_of => Integer

 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   version = new_resource.version || Chef::Wordpress.current_version
 
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   version = new_resource.version || Chef::Wordpress.current_version
 

-  node.normal_unless[:wordpress][:sites][new_resource.site] = {}
+  node.default[:wordpress][:sites][new_resource.site] = {
+    :directory => site_directory
+  }

 
 

-  node.normal[:wordpress][:sites][new_resource.site][:directory] = site_directory
-
-  node.normal_unless[:wordpress][:sites][new_resource.site][:auth_key] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:secure_auth_key] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:logged_in_key] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:nonce_key] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:auth_salt] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:secure_auth_salt] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:logged_in_salt] = SecureRandom.base64(48)
-  node.normal_unless[:wordpress][:sites][new_resource.site][:nonce_salt] = SecureRandom.base64(48)
+  auth_key = persistent_token("wordpress", new_resource.site, "auth_key")
+  secure_auth_key = persistent_token("wordpress", new_resource.site, "secure_auth_key")
+  logged_in_key = persistent_token("wordpress", new_resource.site, "logged_in_key")
+  nonce_key = persistent_token("wordpress", new_resource.site, "nonce_key")
+  auth_salt = persistent_token("wordpress", new_resource.site, "auth_salt")
+  secure_auth_salt = persistent_token("wordpress", new_resource.site, "secure_auth_salt")
+  logged_in_salt = persistent_token("wordpress", new_resource.site, "logged_in_salt")
+  nonce_salt = persistent_token("wordpress", new_resource.site, "nonce_salt")

 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password


@@ -60,7 +64,7 @@ action :create do
   declare_resource :directory, site_directory do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
   declare_resource :directory, site_directory do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]

-    mode 0o755
+    mode "755"

   end
 
   subversion site_directory do
   end
 
   subversion site_directory do


@@ -77,14 +81,14 @@ action :create do
     line.gsub!(/password_here/, new_resource.database_password)
     line.gsub!(/wp_/, new_resource.database_prefix)
 
     line.gsub!(/password_here/, new_resource.database_password)
     line.gsub!(/wp_/, new_resource.database_prefix)
 

-    line.gsub!(/('AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:auth_key]}'")
-    line.gsub!(/('SECURE_AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:secure_auth_key]}'")
-    line.gsub!(/('LOGGED_IN_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:logged_in_key]}'")
-    line.gsub!(/('NONCE_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:nonce_key]}'")
-    line.gsub!(/('AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:auth_salt]}'")
-    line.gsub!(/('SECURE_AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:secure_auth_salt]}'")
-    line.gsub!(/('LOGGED_IN_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:logged_in_salt]}'")
-    line.gsub!(/('NONCE_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:nonce_salt]}'")
+    line.gsub!(/('AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{auth_key}'")
+    line.gsub!(/('SECURE_AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{secure_auth_key}'")
+    line.gsub!(/('LOGGED_IN_KEY', *)'put your unique phrase here'/, "\\1'#{logged_in_key}'")
+    line.gsub!(/('NONCE_KEY', *)'put your unique phrase here'/, "\\1'#{nonce_key}'")
+    line.gsub!(/('AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{auth_salt}'")
+    line.gsub!(/('SECURE_AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{secure_auth_salt}'")
+    line.gsub!(/('LOGGED_IN_SALT', *)'put your unique phrase here'/, "\\1'#{logged_in_salt}'")
+    line.gsub!(/('NONCE_SALT', *)'put your unique phrase here'/, "\\1'#{nonce_salt}'")

 
     if line =~ /define\('WP_DEBUG'/
       line += "\n"
 
     if line =~ /define\('WP_DEBUG'/
       line += "\n"


@@ -92,10 +96,8 @@ action :create do
       line += " * Don't allow file editing.\n"
       line += " */\n"
       line += "define('DISALLOW_FILE_EDIT', true);\n"
       line += " * Don't allow file editing.\n"
       line += " */\n"
       line += "define('DISALLOW_FILE_EDIT', true);\n"

-      if new_resource.ssl_enabled
-        line += "define('FORCE_SSL_LOGIN', true);\n"
-        line += "define('FORCE_SSL_ADMIN', true);\n"
-      end
+      line += "define('FORCE_SSL_LOGIN', true);\n"
+      line += "define('FORCE_SSL_ADMIN', true);\n"

     end
 
     line
     end
 
     line


@@ -104,14 +106,14 @@ action :create do
   file "#{site_directory}/wp-config.php" do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
   file "#{site_directory}/wp-config.php" do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]

-    mode 0o644
+    mode "644"

     content wp_config
   end
 
   declare_resource :directory, "#{site_directory}/wp-content/uploads" do
     owner "www-data"
     group "www-data"
     content wp_config
   end
 
   declare_resource :directory, "#{site_directory}/wp-content/uploads" do
     owner "www-data"
     group "www-data"

-    mode 0o755
+    mode "755"

   end
 
   file "#{site_directory}/sitemap.xml" do
   end
 
   file "#{site_directory}/sitemap.xml" do


@@ -126,13 +128,25 @@ action :create do
     cookbook "wordpress"
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
     cookbook "wordpress"
     owner node[:wordpress][:user]
     group node[:wordpress][:group]

-    mode 0o644
+    mode "644"

     backup false
   end
 
   ssl_certificate new_resource.site do
     domains [new_resource.site] + Array(new_resource.aliases)
     backup false
   end
 
   ssl_certificate new_resource.site do
     domains [new_resource.site] + Array(new_resource.aliases)

-    only_if { new_resource.ssl_enabled }
+  end
+
+  php_fpm new_resource.site do
+    pm_max_children new_resource.fpm_max_children
+    pm_start_servers new_resource.fpm_start_servers
+    pm_min_spare_servers new_resource.fpm_min_spare_servers
+    pm_max_spare_servers new_resource.fpm_max_spare_servers
+    request_terminate_timeout new_resource.fpm_request_terminate_timeout
+    php_admin_values "open_basedir" => "#{site_directory}/:/usr/share/php/:/tmp/",
+                     "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open"
+    php_values "upload_max_filesize" => "70M",
+               "post_max_size" => "100M"
+    prometheus_port new_resource.fpm_prometheus_port

   end
 
   apache_site new_resource.site do
   end
 
   apache_site new_resource.site do


@@ -140,14 +154,13 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),

-              :urls => new_resource.urls,
-              :ssl_enabled => new_resource.ssl_enabled
+              :urls => new_resource.urls

     reload_apache false
   end
 
     reload_apache false
   end
 

-  http_request "http://#{new_resource.site}/wp-admin/upgrade.php" do
+  http_request "https://#{new_resource.site}/wp-admin/upgrade.php" do

     action :nothing
     action :nothing

-    url "http://#{new_resource.site}/wp-admin/upgrade.php?step=1"
+    url "https://#{new_resource.site}/wp-admin/upgrade.php?step=1"

     subscribes :get, "subversion[#{site_directory}]"
   end
 
     subscribes :get, "subversion[#{site_directory}]"
   end
 


@@ -201,6 +214,7 @@ end
 
 action_class do
   include Chef::Mixin::EditFile
 
 action_class do
   include Chef::Mixin::EditFile

+  include Chef::Mixin::PersistentToken

 
   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"
 
   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"