From bf1864fe376a39c90d42fc7e36f2c1c61ee14a78 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 12 Apr 2016 19:27:30 -0300 Subject: [PATCH 01/33] Adding SSL support and error log. --- .gitignore | 2 ++ README.md | 7 +++++++ attributes/default.rb | 1 + metadata.rb | 2 +- recipes/nginx.rb | 8 ++++---- templates/default/nginx.conf.erb | 7 ++++++- templates/default/wordpress.conf.erb | 18 ++++++++++++++++++ templates/default/wp-config.php.erb | 9 +++++++++ 8 files changed, 48 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index dd1e425..6d776ed 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ Gemfile.lock .kitchen bin .kitchen.local.yml + +*.iml diff --git a/README.md b/README.md index 1a99f24..053cadd 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,13 @@ Attributes * `node['wordpress']['php_options']` - Additional PHP settings for the installation. +* `node['wordpress']['ssl_enabled']` - If true, the certificate attributes must be set +* `node['wordpress']['ssl_certificate']` - Path to the certificate +* `node['wordpress']['ssl_certificate_key']` - Path to the certificate key +* `node['wordpress']['ssl_certificate_chain']` - Path to the certificate chain. Only for apache. + +* `node['wordpress']['error_log']` - Path to the error log file. Should be writable by the user that runs apache + Usage ===== diff --git a/attributes/default.rb b/attributes/default.rb index 873753d..8fb35ea 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -62,6 +62,7 @@ default['wordpress']['config_perms'] = 0644 default['wordpress']['server_aliases'] = [node['fqdn']] default['wordpress']['server_port'] = '80' +default['wordpress']['ssl_enabled'] = false default['wordpress']['install']['user'] = node['apache']['user'] default['wordpress']['install']['group'] = node['apache']['group'] diff --git a/metadata.rb b/metadata.rb index febe26f..5b818e0 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.0" +version "3.0.2" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/nginx.rb b/recipes/nginx.rb index 7820a2b..aa98795 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -44,10 +44,10 @@ template "#{node['nginx']['dir']}/sites-enabled/wordpress.conf" do source "nginx.conf.erb" variables( - :docroot => node['wordpress']['dir'], - :server_name => node['wordpress']['server_name'], - :server_aliases => node['wordpress']['server_aliases'], - :server_port => node['wordpress']['server_port'] + :docroot => node['wordpress']['dir'], + :server_name => node['wordpress']['server_name'], + :server_aliases => node['wordpress']['server_aliases'], + :server_port => node['wordpress']['server_port'] ) action :create end diff --git a/templates/default/nginx.conf.erb b/templates/default/nginx.conf.erb index 8b19b5a..e263a4e 100644 --- a/templates/default/nginx.conf.erb +++ b/templates/default/nginx.conf.erb @@ -1,7 +1,12 @@ server { - listen <%= @server_port %>; + listen <%= @server_port %> <% if port == node['wordpress']['ssl_enabled'] %> ssl<% end %>; server_name <%= @server_name %> <%= @server_aliases.join(" ") %>; + <% if node['wordpress']['ssl_enabled'] %> + ssl_certificate <%= node['wordpress']['ssl_certificate'] %>; + ssl_certificate_key <%= node['wordpress']['ssl_certificate_key'] %>; + <% end %> + access_log /var/log/nginx/<%= @server_name %>.access.log; error_log /var/log/nginx/<%= @server_name %>.error.log; diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 2fc691b..c4f9751 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,8 +1,26 @@ +<% if node['wordpress']['ssl_enabled'] %> +NameVirtualHost *:80 + + + ServerName <%= @params[:server_name] %> + Redirect permanent / https://<%= @params[:server_name] %>/ + +<% end %> + > ServerName <%= @params[:server_name] %> ServerAlias <% @params[:server_aliases].each do |a| %><%= a %> <% end %> DocumentRoot <%= @params[:docroot] %> + <% if node['wordpress']['ssl_enabled'] %> + SSLEngine on + SSLCertificateFile <%= node['wordpress']['ssl_certificate'] %> + SSLCertificateKeyFile <%= node['wordpress']['ssl_certificate_key'] %> + <% if node['wordpress']['ssl_certificate_chain'] %> + SSLCertificateChainFile <%= node['wordpress']['ssl_certificate_chain'] %> + <% end %> + <% end %> + > Options FollowSymLinks AllowOverride FileInfo Options diff --git a/templates/default/wp-config.php.erb b/templates/default/wp-config.php.erb index ef157d9..dcd784e 100644 --- a/templates/default/wp-config.php.erb +++ b/templates/default/wp-config.php.erb @@ -89,6 +89,15 @@ define( 'WP_ALLOW_MULTISITE', true ); define( '<%= key %>', <%= value %> ); <% end %> + +<% if node['wordpress']['error_log'] %> +@ini_set('log_errors', 'On'); +@ini_set('display_errors', 'Off'); /* enable or disable public display of errors (use 'On' or 'Off') */ +@ini_set('error_log', '<%= node['wordpress']['error_log'] %>'); /* path to server-writable log file */ +@ini_set('error_reporting', E_ALL ^ E_NOTICE ); /* the php parser to all errors, excreportept notices. */ +<% end %> + + /* That's all, stop editing! Happy blogging. */ /** Absolute path to the WordPress directory. */ From 1e209ae5545dd8e1fac326c45f34ff842548034a Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Wed, 15 Jun 2016 15:30:44 -0700 Subject: [PATCH 02/33] Adding SSL support and error log. --- templates/default/wordpress.conf.erb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index c4f9751..51cae3c 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,13 +1,16 @@ +<% target_host = node['wordpress']['ssl_enabled'] ? node['ipaddress'] : '*' %> + <% if node['wordpress']['ssl_enabled'] %> -NameVirtualHost *:80 +NameVirtualHost <% target_host %>:80 - +:80> ServerName <%= @params[:server_name] %> Redirect permanent / https://<%= @params[:server_name] %>/ +<% else %> <% end %> -> +:<%= @params[:server_port] %>> ServerName <%= @params[:server_name] %> ServerAlias <% @params[:server_aliases].each do |a| %><%= a %> <% end %> DocumentRoot <%= @params[:docroot] %> From 929a4624f8abc335e1bd00443ea671d5a4223437 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Wed, 15 Jun 2016 15:31:04 -0700 Subject: [PATCH 03/33] Adding SSL support and error log. --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 5b818e0..a9cffe3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.2" +version "3.0.3" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" From c694641ffc90690b00ad31ad8f8491935856f39b Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sat, 18 Jun 2016 14:32:08 -0700 Subject: [PATCH 04/33] Fixing issue with ipaddress --- metadata.rb | 2 +- templates/default/wordpress.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index a9cffe3..d041eee 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.3" +version "3.0.4" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 51cae3c..817c7e4 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,4 +1,4 @@ -<% target_host = node['wordpress']['ssl_enabled'] ? node['ipaddress'] : '*' %> +<% target_host = node['wordpress']['ssl_enabled'] and node['ipaddress'] ? node['ipaddress'] : '*' %> <% if node['wordpress']['ssl_enabled'] %> NameVirtualHost <% target_host %>:80 From 7761a7510c8d9afd9be7bf57d83dfd4bd8a858bc Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Thu, 23 Jun 2016 12:00:19 -0700 Subject: [PATCH 05/33] Updating mysql2_chef_gem --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d041eee..76bfb11 100644 --- a/metadata.rb +++ b/metadata.rb @@ -16,7 +16,7 @@ depends "apache2", ">= 2.0.0" depends "database", ">= 1.6.0" depends "mysql", ">= 6.0" -depends "mysql2_chef_gem", "~> 1.0.1" +depends "mysql2_chef_gem", ">= 1.1.0" depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" From 27a2e830ce3e81499a598a5467433f98fb1b4cd5 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 10 Oct 2016 00:42:04 -0700 Subject: [PATCH 06/33] Fixing wordpress template --- metadata.rb | 2 +- templates/default/wordpress.conf.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata.rb b/metadata.rb index 76bfb11..bae0edc 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.4" +version "3.0.5" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 817c7e4..93000c8 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,16 +1,16 @@ <% target_host = node['wordpress']['ssl_enabled'] and node['ipaddress'] ? node['ipaddress'] : '*' %> <% if node['wordpress']['ssl_enabled'] %> -NameVirtualHost <% target_host %>:80 +NameVirtualHost <%= target_host %>:80 -:80> +:80> ServerName <%= @params[:server_name] %> Redirect permanent / https://<%= @params[:server_name] %>/ <% else %> <% end %> -:<%= @params[:server_port] %>> +:<%= @params[:server_port] %>> ServerName <%= @params[:server_name] %> ServerAlias <% @params[:server_aliases].each do |a| %><%= a %> <% end %> DocumentRoot <%= @params[:docroot] %> From f40c0818fcd8adbd9b0a981495b8545efb750d08 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 10 Oct 2016 00:46:12 -0700 Subject: [PATCH 07/33] Fixing wordpress template --- metadata.rb | 2 +- templates/default/wordpress.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index bae0edc..331d4a2 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.5" +version "3.0.6" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 93000c8..925ccdd 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,4 +1,4 @@ -<% target_host = node['wordpress']['ssl_enabled'] and node['ipaddress'] ? node['ipaddress'] : '*' %> +<% target_host = (node['wordpress']['ssl_enabled'] and node['ipaddress']) ? node['ipaddress'] : '*' %> <% if node['wordpress']['ssl_enabled'] %> NameVirtualHost <%= target_host %>:80 From 63dfbb8744f6c7ceb1e540617f60f45c7d35b208 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sun, 29 Jan 2017 13:37:27 -0300 Subject: [PATCH 08/33] Using mod_php as mod_php5 is deprecated --- metadata.rb | 2 +- recipes/apache.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index 331d4a2..8229c65 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.6" +version "3.0.7" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/apache.rb b/recipes/apache.rb index 88acc03..8334262 100644 --- a/recipes/apache.rb +++ b/recipes/apache.rb @@ -23,7 +23,7 @@ unless platform? "windows" include_recipe "php::module_mysql" include_recipe "apache2" - include_recipe "apache2::mod_php5" + include_recipe "apache2::mod_php" end include_recipe "wordpress::app" From d7c5ef951f358fd827c5fd25fefb5b4386c1515d Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sun, 29 Jan 2017 14:05:58 -0300 Subject: [PATCH 09/33] Fixing path to apache2 cookbook --- Berksfile | 5 ++++- metadata.rb | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Berksfile b/Berksfile index ea7a934..fefe64c 100644 --- a/Berksfile +++ b/Berksfile @@ -1,7 +1,10 @@ -source "https://supermarket.getchef.com" +source "https://supermarket.chef.io" metadata +cookbook 'php', '>= 2.2.0' +cookbook 'apache2', '>= 3.2.2', git: 'https://github.com/sous-chefs/apache2.git' + group :integration do cookbook 'apt', '~> 2.6.1' end diff --git a/metadata.rb b/metadata.rb index 8229c65..b4558e7 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.7" +version "3.1.0" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -13,7 +13,7 @@ depends cb end -depends "apache2", ">= 2.0.0" +depends "apache2", ">= 3.2.2" depends "database", ">= 1.6.0" depends "mysql", ">= 6.0" depends "mysql2_chef_gem", ">= 1.1.0" From d4fc6675dfeda4cf215bbedf4b13b357302da7d0 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Thu, 20 Jul 2017 15:11:43 -0700 Subject: [PATCH 10/33] Adding ssl config --- metadata.rb | 2 +- templates/default/wordpress.conf.erb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index b4558e7..4cd0e0b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.0" +version "3.1.1" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 925ccdd..5596dd5 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -49,4 +49,8 @@ NameVirtualHost <%= target_host %>:80 RewriteLog <%= node['apache']['log_dir'] %>/<%= @application_name %>-rewrite.log RewriteLogLevel 0 <% end %> + +<% if node['wordpress']['ssl_enabled'] %> + SetEnv nokeepalive ssl-unclean-shutdown +<% end %> From 0f59d0568786e2f0608edb9858d5bd6c65edb770 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Fri, 21 Jul 2017 12:06:09 -0700 Subject: [PATCH 11/33] Bumping versions --- Berksfile | 2 +- metadata.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Berksfile b/Berksfile index fefe64c..34cfdc0 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ source "https://supermarket.chef.io" metadata -cookbook 'php', '>= 2.2.0' +cookbook 'php', '>= 4.5.0' cookbook 'apache2', '>= 3.2.2', git: 'https://github.com/sous-chefs/apache2.git' group :integration do diff --git a/metadata.rb b/metadata.rb index 4cd0e0b..e2a7479 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.1" +version "3.1.2" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -20,8 +20,8 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 2.7.4" -depends "php-fpm", "~> 0.6.10" +depends "nginx", "~> 2.99.0" +depends "php-fpm", "~> 0.7.9" depends 'selinux', '~> 0.7' %w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| From 4bd67666c4f87508c3ab33c1632432df187fabf7 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Fri, 21 Jul 2017 12:08:24 -0700 Subject: [PATCH 12/33] Fixing nginx version --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index e2a7479..d6da01e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 2.99.0" +depends "nginx", "~> 2.7.6" depends "php-fpm", "~> 0.7.9" depends 'selinux', '~> 0.7' From a8ec4a3e4b3ece5f40d20b12e38da33e1d1f528f Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Fri, 21 Jul 2017 12:37:50 -0700 Subject: [PATCH 13/33] Bumping apache2 support --- metadata.rb | 4 ++-- templates/default/wordpress.conf.erb | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/metadata.rb b/metadata.rb index d6da01e..6cb46d4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.2" +version "3.1.3" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -13,7 +13,7 @@ depends cb end -depends "apache2", ">= 3.2.2" +depends "apache2", ">= 5.0.0" depends "database", ">= 1.6.0" depends "mysql", ">= 6.0" depends "mysql2_chef_gem", ">= 1.1.0" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 5596dd5..a44b9b9 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,7 +1,6 @@ <% target_host = (node['wordpress']['ssl_enabled'] and node['ipaddress']) ? node['ipaddress'] : '*' %> <% if node['wordpress']['ssl_enabled'] %> -NameVirtualHost <%= target_host %>:80 :80> ServerName <%= @params[:server_name] %> @@ -27,12 +26,7 @@ NameVirtualHost <%= target_host %>:80 > Options FollowSymLinks AllowOverride FileInfo Options - <% if node['apache']['version'] == '2.4' %> Require all granted - <% else %> - Order allow,deny - Allow from all - <% end %> @@ -45,10 +39,6 @@ NameVirtualHost <%= target_host %>:80 CustomLog <%= node['apache']['log_dir'] %>/<%= @params[:name] %>-access.log combined RewriteEngine On -<% unless node['apache']['version'] == '2.4' %> - RewriteLog <%= node['apache']['log_dir'] %>/<%= @application_name %>-rewrite.log - RewriteLogLevel 0 -<% end %> <% if node['wordpress']['ssl_enabled'] %> SetEnv nokeepalive ssl-unclean-shutdown From 50f8e77e1455d84fde022bbe0d1b1521c9b9e8d4 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Fri, 21 Jul 2017 12:40:40 -0700 Subject: [PATCH 14/33] Bumping mysql --- attributes/default.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8fb35ea..f65913a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -41,7 +41,7 @@ when '10.04' default['wordpress']['db']['mysql_version'] = '5.1' else - default['wordpress']['db']['mysql_version'] = '5.5' + default['wordpress']['db']['mysql_version'] = '5.7' end when 'centos', 'redhat', 'amazon', 'scientific' if node['platform_version'].to_i < 6 @@ -49,10 +49,10 @@ elsif node['platform_version'].to_i < 7 default['wordpress']['db']['mysql_version'] = '5.1' else - default['wordpress']['db']['mysql_version'] = '5.5' + default['wordpress']['db']['mysql_version'] = '5.7' end else - default['wordpress']['db']['mysql_version'] = '5.5' + default['wordpress']['db']['mysql_version'] = '5.7' end default['wordpress']['allow_multisite'] = false From 7ef996cbbe4e8216edaec64088233778d153630f Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 26 Sep 2017 20:38:02 -0700 Subject: [PATCH 15/33] Changes to allow wordpress to be installed in a sub dir --- attributes/default.rb | 3 +++ metadata.rb | 2 +- recipes/apache.rb | 3 ++- templates/default/wordpress.conf.erb | 3 +-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index f65913a..4129fe5 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -61,6 +61,7 @@ default['wordpress']['config_perms'] = 0644 default['wordpress']['server_aliases'] = [node['fqdn']] +default['wordpress']['server_path'] = '/' default['wordpress']['server_port'] = '80' default['wordpress']['ssl_enabled'] = false @@ -93,11 +94,13 @@ if node['platform'] == 'windows' default['wordpress']['parent_dir'] = "#{ENV['SystemDrive']}\\inetpub" default['wordpress']['dir'] = "#{node['wordpress']['parent_dir']}\\wordpress" + default['wordpress']['docroot'] = "#{node['wordpress']['parent_dir']}\\wordpress" default['wordpress']['url'] = "https://wordpress.org/wordpress-#{node['wordpress']['version']}.zip" else default['wordpress']['server_name'] = node['fqdn'] default['wordpress']['parent_dir'] = '/var/www' default['wordpress']['dir'] = "#{node['wordpress']['parent_dir']}/wordpress" + default['wordpress']['docroot'] = "#{node['wordpress']['parent_dir']}/wordpress" default['wordpress']['url'] = "https://wordpress.org/wordpress-#{node['wordpress']['version']}.tar.gz" end diff --git a/metadata.rb b/metadata.rb index 6cb46d4..9468b3f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.3" +version "3.1.4" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/apache.rb b/recipes/apache.rb index 8334262..a14bf28 100644 --- a/recipes/apache.rb +++ b/recipes/apache.rb @@ -47,7 +47,8 @@ else web_app "wordpress" do template "wordpress.conf.erb" - docroot node['wordpress']['dir'] + docroot node['wordpress']['docroot'] + server_path node['wordpress']['server_path'] server_name node['wordpress']['server_name'] server_aliases node['wordpress']['server_aliases'] server_port node['wordpress']['server_port'] diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index a44b9b9..8eda075 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,10 +1,9 @@ <% target_host = (node['wordpress']['ssl_enabled'] and node['ipaddress']) ? node['ipaddress'] : '*' %> <% if node['wordpress']['ssl_enabled'] %> - :80> ServerName <%= @params[:server_name] %> - Redirect permanent / https://<%= @params[:server_name] %>/ + Redirect permanent / https://<%= @params[:server_name] %><%= @params[:server_path] %> <% else %> <% end %> From cd861e9ffd3b0a1ee4ddda34d792294edc0b8695 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 5 Dec 2017 13:12:46 -0300 Subject: [PATCH 16/33] Bumping dependencies --- metadata.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index 9468b3f..f69c70b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.4" +version "3.1.5" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -20,8 +20,8 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 2.7.6" -depends "php-fpm", "~> 0.7.9" +depends "nginx", "~> 7.0.2" +depends "php-fpm", "~> 0.8.0" depends 'selinux', '~> 0.7' %w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| From 0dee03849937434bf46b4488080383f22d015b19 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 12 Mar 2018 10:28:39 -0700 Subject: [PATCH 17/33] Bumping dependencies --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index f69c70b..d0a77ef 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 7.0.2" +depends "nginx", "~> 8.1.2" depends "php-fpm", "~> 0.8.0" depends 'selinux', '~> 0.7' From 87fa11ef7ac4ce067d3f38645360d6dcbdc38fd9 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 12 Mar 2018 10:29:02 -0700 Subject: [PATCH 18/33] Bumping dependencies --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d0a77ef..df799b3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.5" +version "3.1.6" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" From 3ef06bf24c521def77f1f73718a60a1660e1a050 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sat, 17 Mar 2018 07:38:38 -0700 Subject: [PATCH 19/33] Removing deprecated cookbook --- Gemfile | 12 ++++++------ metadata.rb | 2 +- recipes/apache.rb | 1 - recipes/nginx.rb | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 02e31c6..15fb723 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,14 @@ source 'https://rubygems.org' -gem 'chef', '>= 11.12' -gem 'berkshelf', '~> 3.0' +gem 'chef', '>= 12.12' +gem 'berkshelf' group :test do - gem 'foodcritic', '~> 4.0' - gem 'strainer', '~> 3.1' + gem 'foodcritic' + gem 'strainer' end group :integration do - gem 'test-kitchen', '~> 1.0' - gem 'kitchen-vagrant', '~> 0.15' + gem 'test-kitchen' + gem 'kitchen-vagrant' end diff --git a/metadata.rb b/metadata.rb index df799b3..e8e884e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.6" +version "3.1.7" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/apache.rb b/recipes/apache.rb index a14bf28..9198c25 100644 --- a/recipes/apache.rb +++ b/recipes/apache.rb @@ -21,7 +21,6 @@ # On Windows PHP comes with the MySQL Module and we use IIS on Windows unless platform? "windows" - include_recipe "php::module_mysql" include_recipe "apache2" include_recipe "apache2::mod_php" end diff --git a/recipes/nginx.rb b/recipes/nginx.rb index aa98795..d70a77e 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -34,8 +34,6 @@ start_servers 5 end -include_recipe "php::module_mysql" - node.set_unless['nginx']['default_site_enabled'] = false include_recipe "nginx" From 04670ef802efabb13b3ddc4261eaab84d2a70094 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sat, 17 Mar 2018 09:19:20 -0700 Subject: [PATCH 20/33] Fixing mysql issue --- metadata.rb | 2 +- recipes/apache.rb | 2 ++ recipes/nginx.rb | 2 ++ templates/default/wordpress.conf.erb | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index e8e884e..65ce23e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.7" +version "3.1.8" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/apache.rb b/recipes/apache.rb index 9198c25..8609aa3 100644 --- a/recipes/apache.rb +++ b/recipes/apache.rb @@ -23,6 +23,8 @@ unless platform? "windows" include_recipe "apache2" include_recipe "apache2::mod_php" + + package 'php7.0-mysql' end include_recipe "wordpress::app" diff --git a/recipes/nginx.rb b/recipes/nginx.rb index d70a77e..e75d551 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -34,6 +34,8 @@ start_servers 5 end +package 'php7.0-mysql' + node.set_unless['nginx']['default_site_enabled'] = false include_recipe "nginx" diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 8eda075..e2a96e1 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -1,13 +1,12 @@ <% target_host = (node['wordpress']['ssl_enabled'] and node['ipaddress']) ? node['ipaddress'] : '*' %> - <% if node['wordpress']['ssl_enabled'] %> :80> ServerName <%= @params[:server_name] %> Redirect permanent / https://<%= @params[:server_name] %><%= @params[:server_path] %> + <% else %> <% end %> - :<%= @params[:server_port] %>> ServerName <%= @params[:server_name] %> ServerAlias <% @params[:server_aliases].each do |a| %><%= a %> <% end %> From 56c03e90ef41d9e4573bf5af338ca4b3c2ee7252 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Wed, 15 Aug 2018 13:00:18 -0700 Subject: [PATCH 21/33] Adding basic auth to wordpress --- attributes/default.rb | 4 ++ recipes/default.rb | 18 +++++++++ templates/default/nginx.conf.erb | 57 ++++++++++++++++++---------- templates/default/wordpress.conf.erb | 17 +++++++++ 4 files changed, 77 insertions(+), 19 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 4129fe5..62dc317 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -105,3 +105,7 @@ end default['wordpress']['php_options'] = { 'php_admin_value[upload_max_filesize]' => '50M', 'php_admin_value[post_max_size]' => '55M' } + +default['wordpress']['admin'] = { + htpasswd: "/var/www/admin/.htpasswd" +} diff --git a/recipes/default.rb b/recipes/default.rb index 39636ec..d8b6f44 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -17,4 +17,22 @@ # limitations under the License. # +users = node[:wordpress][:admin][:users] || [] + +if users.any? + directory File.dirname(node[:wordpress][:admin][:htpasswd]) do + owner 'root' + group 'root' + recursive true + mode 0755 + end + + file node[:wordpress][:admin][:htpasswd] do + owner node[:wordpress][:install][:user] + group node[:wordpress][:install][:group] + mode 0644 + content users.join("\n") + end +end + include_recipe "wordpress::apache" diff --git a/templates/default/nginx.conf.erb b/templates/default/nginx.conf.erb index e263a4e..e0d4c6e 100644 --- a/templates/default/nginx.conf.erb +++ b/templates/default/nginx.conf.erb @@ -1,26 +1,45 @@ server { - listen <%= @server_port %> <% if port == node['wordpress']['ssl_enabled'] %> ssl<% end %>; - server_name <%= @server_name %> <%= @server_aliases.join(" ") %>; + listen <%= @server_port %> <% if port == node['wordpress']['ssl_enabled'] %> ssl<% end %>; + server_name <%= @server_name %> <%= @server_aliases.join(" ") %>; - <% if node['wordpress']['ssl_enabled'] %> - ssl_certificate <%= node['wordpress']['ssl_certificate'] %>; - ssl_certificate_key <%= node['wordpress']['ssl_certificate_key'] %>; - <% end %> + <% if node['wordpress']['ssl_enabled'] %> + ssl_certificate <%= node['wordpress']['ssl_certificate'] %>; + ssl_certificate_key <%= node['wordpress']['ssl_certificate_key'] %>; + <% end %> - access_log /var/log/nginx/<%= @server_name %>.access.log; - error_log /var/log/nginx/<%= @server_name %>.error.log; + access_log /var/log/nginx/<%= @server_name %>.access.log; + error_log /var/log/nginx/<%= @server_name %>.error.log; - root <%= @docroot %>; - index index.php; + root <%= @docroot %>; + index index.php; - location / { - try_files $uri $uri/ /index.php?$args; - } + <% if (node[:wordpress][:admin][:users] || []).any? %> + location /wp-login.php { + auth_basic "Authorization Required"; + auth_basic_user_file /srv/www/rudeotter.com/.htpasswd; - location ~ \.php$ { - try_files $uri =404; - include fastcgi_params; - fastcgi_pass 127.0.0.1:9001; - fastcgi_param SCRIPT_FILENAME <%= @docroot %>$fastcgi_script_name; - } + try_files $uri $uri/ /index.php?$args; + } + location /wp-admin { + location ~ /wp-admin/admin-ajax.php$ { + try_files $uri $uri/ /index.php?$args; + } + location ~* /wp-admin/.*\.php$ { + auth_basic "Authorization Required"; + auth_basic_user_file /srv/www/rudeotter.com/.htpasswd; + try_files $uri $uri/ /index.php?$args; + } + } + +<% end %> + location / { + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.php$ { + try_files $uri =404; + include fastcgi_params; + fastcgi_pass 127.0.0.1:9001; + fastcgi_param SCRIPT_FILENAME <%= @docroot %>$fastcgi_script_name; + } } diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index e2a96e1..73049b9 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -21,6 +21,23 @@ <% end %> <% end %> + <% if (node[:wordpress][:admin][:users] || []).any? %> + + AuthName "Admins Only" + AuthUserFile <%= node['wordpress']['admin']['htpasswd'] %> + AuthGroupFile /dev/null + AuthType basic + require valid-user + + + AuthName "Admins Only" + AuthUserFile <%= node['wordpress']['admin']['htpasswd'] %> + AuthGroupFile /dev/null + AuthType basic + require valid-user + + + <% end %> > Options FollowSymLinks AllowOverride FileInfo Options From b7086cd1e6653c86b0f07151f5209ccd709b1b7b Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 18 Dec 2018 17:25:30 -0300 Subject: [PATCH 22/33] Bumping upload --- metadata.rb | 2 +- templates/default/nginx.conf.erb | 2 ++ templates/default/wordpress.conf.erb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 65ce23e..ff7b0ba 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.8" +version "3.1.9" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/templates/default/nginx.conf.erb b/templates/default/nginx.conf.erb index e0d4c6e..e81e97d 100644 --- a/templates/default/nginx.conf.erb +++ b/templates/default/nginx.conf.erb @@ -13,6 +13,8 @@ server { root <%= @docroot %>; index index.php; + client_max_body_size 64M; + <% if (node[:wordpress][:admin][:users] || []).any? %> location /wp-login.php { auth_basic "Authorization Required"; diff --git a/templates/default/wordpress.conf.erb b/templates/default/wordpress.conf.erb index 73049b9..b3c3ba0 100644 --- a/templates/default/wordpress.conf.erb +++ b/templates/default/wordpress.conf.erb @@ -12,6 +12,8 @@ ServerAlias <% @params[:server_aliases].each do |a| %><%= a %> <% end %> DocumentRoot <%= @params[:docroot] %> + SecRequestBodyLimit 67108864 + <% if node['wordpress']['ssl_enabled'] %> SSLEngine on SSLCertificateFile <%= node['wordpress']['ssl_certificate'] %> From 5df9d3ecb8e90900874f4f1a107bb360547f7c57 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 29 Jul 2019 12:05:44 -0400 Subject: [PATCH 23/33] Bumping nginx --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index ff7b0ba..190e8d3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 8.1.2" +depends "nginx", "~> 9.0.0" depends "php-fpm", "~> 0.8.0" depends 'selinux', '~> 0.7' From aa6cf6cb1fc132f5bc2217548be2c6a0d468c976 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 29 Jul 2019 12:20:25 -0400 Subject: [PATCH 24/33] Rolling back nginx --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 190e8d3..ff7b0ba 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends "build-essential" depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" -depends "nginx", "~> 9.0.0" +depends "nginx", "~> 8.1.2" depends "php-fpm", "~> 0.8.0" depends 'selinux', '~> 0.7' From 2eca6f1c759e0f2c4c7a002b165b8c5a22a9aa94 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 5 Nov 2019 11:22:15 -0300 Subject: [PATCH 25/33] Using Berksfile.lock --- .gitignore | 2 +- Berksfile.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ metadata.rb | 10 ++++----- 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 Berksfile.lock diff --git a/.gitignore b/.gitignore index 6d776ed..479896b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .vagrant -Berksfile.lock +.idea Gemfile.lock *~ *# diff --git a/Berksfile.lock b/Berksfile.lock new file mode 100644 index 0000000..ea1223d --- /dev/null +++ b/Berksfile.lock @@ -0,0 +1,57 @@ +DEPENDENCIES + apache2 + git: https://github.com/sous-chefs/apache2.git + revision: 408c54912f0e362ea9d820a8b43580850c403b9e + apt (~> 2.6.1) + php (>= 4.5.0) + wordpress + path: . + metadata: true + +GRAPH + apache2 (7.1.1) + apt (2.6.1) + build-essential (8.2.1) + mingw (>= 1.1) + seven_zip (>= 0.0.0) + database (6.1.1) + postgresql (>= 1.0.0) + iis (7.2.0) + windows (>= 4.1.0) + mariadb (3.1.0) + selinux_policy (~> 2.0) + mingw (2.1.0) + seven_zip (>= 0.0.0) + mysql (8.5.1) + mysql2_chef_gem (2.1.0) + build-essential (>= 2.4.0) + mariadb (>= 0.0.0) + mysql (>= 8.2.0) + nginx (10.0.2) + ohai (~> 5.2) + ohai (5.3.0) + openssl (8.5.5) + php (7.0.0) + yum-epel (>= 0.0.0) + php-fpm (0.8.0) + postgresql (7.1.4) + selinux (3.0.0) + selinux_policy (2.3.4) + seven_zip (3.1.2) + windows (>= 0.0.0) + tar (2.2.0) + windows (6.0.1) + wordpress (3.1.9) + apache2 (>= 5.0.0) + build-essential (>= 0.0.0) + database (>= 1.6.0) + iis (>= 0.0.0) + mysql (>= 6.0) + mysql2_chef_gem (>= 1.1.0) + nginx (~> 10.0.2) + openssl (>= 0.0.0) + php (>= 0.0.0) + php-fpm (>= 0.0.0) + selinux (>= 0.0.0) + tar (>= 0.0.0) + yum-epel (3.3.0) diff --git a/metadata.rb b/metadata.rb index ff7b0ba..6fc2d4d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,11 +18,11 @@ depends "mysql", ">= 6.0" depends "mysql2_chef_gem", ">= 1.1.0" depends "build-essential" -depends "iis", ">= 1.6.2" -depends "tar", ">= 0.3.1" -depends "nginx", "~> 8.1.2" -depends "php-fpm", "~> 0.8.0" -depends 'selinux', '~> 0.7' +depends "iis" +depends "tar" +depends "nginx", "~> 10.0.2" +depends "php-fpm" +depends 'selinux' %w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| supports os From 2bd5d065e521b12fefafa166f57285ba628c4a13 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 5 Nov 2019 11:22:41 -0300 Subject: [PATCH 26/33] Bumping version --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 6fc2d4d..e198ca6 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.1.9" +version "4.0.0" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" From a155b4a3259d46466fe8997baa70af4a52870dce Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 5 Nov 2019 13:56:15 -0300 Subject: [PATCH 27/33] Using nginx 8.1.6 because of chef --- Berksfile | 1 + Berksfile.lock | 16 ++++++++++++---- metadata.rb | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Berksfile b/Berksfile index 34cfdc0..ae73f84 100644 --- a/Berksfile +++ b/Berksfile @@ -4,6 +4,7 @@ metadata cookbook 'php', '>= 4.5.0' cookbook 'apache2', '>= 3.2.2', git: 'https://github.com/sous-chefs/apache2.git' +cookbook 'nginx', '= 8.1.6', git: 'https://github.com/sous-chefs/nginx.git', tag: "v8.1.6" group :integration do cookbook 'apt', '~> 2.6.1' diff --git a/Berksfile.lock b/Berksfile.lock index ea1223d..9a17a24 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -3,6 +3,10 @@ DEPENDENCIES git: https://github.com/sous-chefs/apache2.git revision: 408c54912f0e362ea9d820a8b43580850c403b9e apt (~> 2.6.1) + nginx + git: https://github.com/sous-chefs/nginx.git + revision: 09a227085c5fab9f986fe0cfd010452e07c707f8 + tag: v8.1.6 php (>= 4.5.0) wordpress path: . @@ -27,8 +31,11 @@ GRAPH build-essential (>= 2.4.0) mariadb (>= 0.0.0) mysql (>= 8.2.0) - nginx (10.0.2) - ohai (~> 5.2) + nginx (8.1.6) + build-essential (>= 5.0) + ohai (>= 4.1.0) + yum-epel (>= 0.0.0) + zypper (>= 0.0.0) ohai (5.3.0) openssl (8.5.5) php (7.0.0) @@ -41,17 +48,18 @@ GRAPH windows (>= 0.0.0) tar (2.2.0) windows (6.0.1) - wordpress (3.1.9) + wordpress (4.0.0) apache2 (>= 5.0.0) build-essential (>= 0.0.0) database (>= 1.6.0) iis (>= 0.0.0) mysql (>= 6.0) mysql2_chef_gem (>= 1.1.0) - nginx (~> 10.0.2) + nginx (~> 8.1.6) openssl (>= 0.0.0) php (>= 0.0.0) php-fpm (>= 0.0.0) selinux (>= 0.0.0) tar (>= 0.0.0) yum-epel (3.3.0) + zypper (0.4.0) diff --git a/metadata.rb b/metadata.rb index e198ca6..faf6d7c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,7 +20,7 @@ depends "build-essential" depends "iis" depends "tar" -depends "nginx", "~> 10.0.2" +depends "nginx", "~> 8.1.6" depends "php-fpm" depends 'selinux' From f5d20b6ee83c2658b0687f43a62e515638078bec Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Mon, 2 Dec 2019 12:32:37 -0300 Subject: [PATCH 28/33] Mysql 8.0 --- attributes/default.rb | 11 +++++++---- metadata.rb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 62dc317..dc971b6 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -33,7 +33,7 @@ default['wordpress']['db']['prefix'] = 'wp_' default['wordpress']['db']['host'] = 'localhost' default['wordpress']['db']['port'] = '3306' # Must be a string -default['wordpress']['db']['charset'] = 'utf8' +default['wordpress']['db']['charset'] = 'utf8mb4' default['wordpress']['db']['collate'] = '' case node['platform'] when 'ubuntu' @@ -41,7 +41,8 @@ when '10.04' default['wordpress']['db']['mysql_version'] = '5.1' else - default['wordpress']['db']['mysql_version'] = '5.7' + default['wordpress']['db']['mysql_version'] = '8.0' + default['wordpress']['db']['collate'] = 'utf8mb4_0900_ai_ci' end when 'centos', 'redhat', 'amazon', 'scientific' if node['platform_version'].to_i < 6 @@ -49,10 +50,12 @@ elsif node['platform_version'].to_i < 7 default['wordpress']['db']['mysql_version'] = '5.1' else - default['wordpress']['db']['mysql_version'] = '5.7' + default['wordpress']['db']['mysql_version'] = '8.0' + default['wordpress']['db']['collate'] = 'utf8mb4_0900_ai_ci' end else - default['wordpress']['db']['mysql_version'] = '5.7' + default['wordpress']['db']['mysql_version'] = '8.0' + default['wordpress']['db']['collate'] = 'utf8mb4_0900_ai_ci' end default['wordpress']['allow_multisite'] = false diff --git a/metadata.rb b/metadata.rb index faf6d7c..0caf0e5 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "4.0.0" +version "4.0.1" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" From 2074ab2236e2753cfed09b8433b9f3794f772ac9 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 3 Dec 2019 17:41:51 -0300 Subject: [PATCH 29/33] php7.2-mysql --- metadata.rb | 2 +- recipes/apache.rb | 2 +- recipes/nginx.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index 0caf0e5..49e4687 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "4.0.1" +version "4.0.2" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" diff --git a/recipes/apache.rb b/recipes/apache.rb index 8609aa3..21b5d96 100644 --- a/recipes/apache.rb +++ b/recipes/apache.rb @@ -24,7 +24,7 @@ include_recipe "apache2" include_recipe "apache2::mod_php" - package 'php7.0-mysql' + package 'php7.2-mysql' end include_recipe "wordpress::app" diff --git a/recipes/nginx.rb b/recipes/nginx.rb index e75d551..a22dfcb 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -34,7 +34,7 @@ start_servers 5 end -package 'php7.0-mysql' +package 'php7.2-mysql' node.set_unless['nginx']['default_site_enabled'] = false include_recipe "nginx" From 59b40f30a9aaf8222257f7071aa425ca35910f34 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 3 Dec 2019 20:47:32 -0300 Subject: [PATCH 30/33] database for mysql 8 --- Berksfile | 2 ++ Berksfile.lock | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Berksfile b/Berksfile index ae73f84..7da5188 100644 --- a/Berksfile +++ b/Berksfile @@ -6,6 +6,8 @@ cookbook 'php', '>= 4.5.0' cookbook 'apache2', '>= 3.2.2', git: 'https://github.com/sous-chefs/apache2.git' cookbook 'nginx', '= 8.1.6', git: 'https://github.com/sous-chefs/nginx.git', tag: "v8.1.6" +cookbook 'database', git: 'https://github.com/alejandrod/database.git' + group :integration do cookbook 'apt', '~> 2.6.1' end diff --git a/Berksfile.lock b/Berksfile.lock index 9a17a24..2a0aca1 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -3,6 +3,9 @@ DEPENDENCIES git: https://github.com/sous-chefs/apache2.git revision: 408c54912f0e362ea9d820a8b43580850c403b9e apt (~> 2.6.1) + database + git: https://github.com/alejandrod/database.git + revision: ef8cd37a0907cc5e830fb541ba07c4e765e3e09b nginx git: https://github.com/sous-chefs/nginx.git revision: 09a227085c5fab9f986fe0cfd010452e07c707f8 @@ -18,7 +21,7 @@ GRAPH build-essential (8.2.1) mingw (>= 1.1) seven_zip (>= 0.0.0) - database (6.1.1) + database (6.2.0) postgresql (>= 1.0.0) iis (7.2.0) windows (>= 4.1.0) @@ -41,14 +44,14 @@ GRAPH php (7.0.0) yum-epel (>= 0.0.0) php-fpm (0.8.0) - postgresql (7.1.4) + postgresql (7.1.5) selinux (3.0.0) selinux_policy (2.3.4) seven_zip (3.1.2) windows (>= 0.0.0) tar (2.2.0) windows (6.0.1) - wordpress (4.0.0) + wordpress (4.0.2) apache2 (>= 5.0.0) build-essential (>= 0.0.0) database (>= 1.6.0) From 4574a582e3a21c83ea0b763f33b16bca8c1bf131 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Tue, 3 Dec 2019 20:59:05 -0300 Subject: [PATCH 31/33] Bumping cookbooks --- Berksfile | 2 ++ Berksfile.lock | 8 +++++++- metadata.rb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Berksfile b/Berksfile index 7da5188..a64495c 100644 --- a/Berksfile +++ b/Berksfile @@ -7,6 +7,8 @@ cookbook 'apache2', '>= 3.2.2', git: 'https://github.com/sous-chefs/apache2.git' cookbook 'nginx', '= 8.1.6', git: 'https://github.com/sous-chefs/nginx.git', tag: "v8.1.6" cookbook 'database', git: 'https://github.com/alejandrod/database.git' +cookbook 'mysql', git: 'https://github.com/alejandrod/mysql.git' +cookbook 'mysql2_chef_gem', '>= 2.1.0', git: 'https://github.com/alejandrod/mysql2_chef_gem.git' group :integration do cookbook 'apt', '~> 2.6.1' diff --git a/Berksfile.lock b/Berksfile.lock index 2a0aca1..c6b6f51 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -6,6 +6,12 @@ DEPENDENCIES database git: https://github.com/alejandrod/database.git revision: ef8cd37a0907cc5e830fb541ba07c4e765e3e09b + mysql + git: https://github.com/alejandrod/mysql.git + revision: f46870cc59b9a3f28c7d05ae935fc9f0672a6bbd + mysql2_chef_gem + git: https://github.com/alejandrod/mysql2_chef_gem.git + revision: 4e8feb1263c7e22ec0c8e9129ae850f607c7bb99 nginx git: https://github.com/sous-chefs/nginx.git revision: 09a227085c5fab9f986fe0cfd010452e07c707f8 @@ -29,7 +35,7 @@ GRAPH selinux_policy (~> 2.0) mingw (2.1.0) seven_zip (>= 0.0.0) - mysql (8.5.1) + mysql (8.5.3) mysql2_chef_gem (2.1.0) build-essential (>= 2.4.0) mariadb (>= 0.0.0) diff --git a/metadata.rb b/metadata.rb index 49e4687..41c83a3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "4.0.2" +version "4.1.0" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" From 2344d8d920341be2888ee902a7e4fae4cdcbb7e8 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Wed, 4 Dec 2019 07:49:45 -0300 Subject: [PATCH 32/33] Using version '8.0' --- recipes/database.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/database.rb b/recipes/database.rb index 3f61d78..a93c042 100644 --- a/recipes/database.rb +++ b/recipes/database.rb @@ -23,10 +23,13 @@ mysql_client 'default' do action :create not_if { node['platform_family'] == 'windows' } + version '8.0' end mysql2_chef_gem 'default' do action :install + gem_version '0.5.3' + package_version '8.0' end ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password) From 843335f6102044d6e3f1743a37a08e617fd452ab Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Wed, 4 Dec 2019 07:52:51 -0300 Subject: [PATCH 33/33] Adding mysql repo --- recipes/database.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes/database.rb b/recipes/database.rb index a93c042..f5c4c97 100644 --- a/recipes/database.rb +++ b/recipes/database.rb @@ -20,6 +20,14 @@ # limitations under the License. # +apt_repository 'mysql' do + uri 'http://repo.mysql.com/apt/ubuntu/' + components %w(mysql-8.0 mysql-tools) + key '5072E1F5' + keyserver 'pool.sks-keyservers.net' + not_if { ::File.exist?('/etc/apt/sources.list.d/mysql.list') } +end + mysql_client 'default' do action :create not_if { node['platform_family'] == 'windows' }