Update kosmos-wordpress for Ubuntu 16.04

site-cookbooks/kosmos-wordpress/metadata.rb

@@ -8,3 +8,6 @@ version          '0.1.0'
 
 depends 'wordpress'
 depends 'php-fpm'
+depends 'backup'
+depends 'kosmos-base'
+depends 'kosmos-nginx'

site-cookbooks/kosmos-wordpress/recipes/default.rb

@@ -12,7 +12,6 @@ mysql_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mysql')
 node.override['wordpress']['db']['root_password'] = mysql_credentials["root_password"]
 node.override['wordpress']['server_name']         = "blog.kosmos.org"
 node.override['wordpress']['server_aliases']      = ["blog.kosmos.org"]
-node.override['wordpress']['db']['mysql_version'] = "5.6"
 node.override['wordpress']['server_port']         = "443"
 credentials = Chef::EncryptedDataBagItem.load('credentials', 'wordpress')
 node.set['wordpress']['db']['pass']               = credentials["db_pass"]
@@ -29,7 +28,7 @@ include_recipe 'kosmos-wordpress::nginx'
 
 node.override["backup"]["mysql"]["host"] = "localhost"
 node.override["backup"]["mysql"]["username"] = "root"
-node.override["backup"]["mysql"]["password"] = node["mediawiki"]["db"]["root_password"]
+node.override["backup"]["mysql"]["password"] = node["wordpress"]["db"]["root_password"]
 unless node["backup"]["mysql"]["databases"].include? "wordpressdb"
   node.override["backup"]["mysql"]["databases"] =
     node["backup"]["mysql"]["databases"].to_a << "wordpressdb"

site-cookbooks/kosmos-wordpress/recipes/nginx.rb

@@ -9,35 +9,9 @@
 
 node.set_unless['php-fpm']['pools'] = []
 
-include_recipe "php-fpm::configure"
+include_recipe "php-fpm"
 include_recipe 'php-fpm::repository' unless node['php-fpm']['skip_repository_install']
-include_recipe "kosmos-base::letsencrypt"
+include_recipe "php-fpm::install"
-
-if node['php-fpm']['package_name'].nil?
-  if platform_family?("rhel")
-    php_fpm_package_name = "php-fpm"
-  else
-    php_fpm_package_name = "php5-fpm"
-  end
-else
-  php_fpm_package_name = node['php-fpm']['package_name']
-end
-
-package php_fpm_package_name do
-  action :upgrade
-end
-
-if node['php-fpm']['service_name'].nil?
-  php_fpm_service_name = php_fpm_package_name
-else
-  php_fpm_service_name = node['php-fpm']['service_name']
-end
-
-service "php-fpm" do
-  service_name php_fpm_service_name
-  supports :start => true, :stop => true, :restart => true, :reload => true
-  action [ :enable, :start ]
-end
 
 php_fpm_pool "www" do
   enable false
@@ -47,9 +21,6 @@ php_fpm_pool "wordpress" do
   listen "127.0.0.1:9001"
   user node['wordpress']['install']['user']
   group node['wordpress']['install']['group']
-  if node['platform'] == 'ubuntu' and node['platform_version'] == '10.04'
-    process_manager 'dynamic'
-  end
   listen_owner node['wordpress']['install']['user']
   listen_group node['wordpress']['install']['group']
   php_options node['wordpress']['php_options']
@@ -63,13 +34,19 @@ include_recipe "kosmos-nginx"
 
 include_recipe "wordpress::app"
 
+unless node.chef_environment == "development"
+  include_recipe "kosmos-base::letsencrypt"
+
   execute "letsencrypt cert for blog.kosmos.org" do
     command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node['wordpress']['dir']} -d blog.kosmos.org -n"
     cwd "/usr/local/certbot"
     not_if { File.exist? "/etc/letsencrypt/live/blog.kosmos.org/fullchain.pem" }
     notifies :reload, "service[nginx]", :delayed
   end
+end
 
+ssl_cert = "/etc/letsencrypt/live/blog.kosmos.org/fullchain.pem"
+ssl_key  = "/etc/letsencrypt/live/blog.kosmos.org/privkey.pem"
 template "#{node['nginx']['dir']}/sites-available/wordpress" do
   source "nginx.conf.erb"
   variables(
@@ -77,8 +54,8 @@ template "#{node['nginx']['dir']}/sites-available/wordpress" do
     server_name:    node['wordpress']['server_name'],
     server_aliases: node['wordpress']['server_aliases'],
     server_port:    node['wordpress']['server_port'],
-    ssl_cert:       "/etc/letsencrypt/live/blog.kosmos.org/fullchain.pem",
+    ssl_cert:       ssl_cert,
-    ssl_key:        "/etc/letsencrypt/live/blog.kosmos.org/privkey.pem"
+    ssl_key:        ssl_key
   )
   action :create
   notifies :reload, "service[nginx]", :delayed