Update cookbooks for Ubuntu 16.04 TLS

cookbooks/mediawiki/recipes/database.rb

@@ -22,6 +22,11 @@ end
 socket = "/var/run/mysql-#{db['instance_name']}/mysqld.sock"
 
 if node['platform_family'] == 'debian'
+  directory "/var/run/mysqld" do
+    action :create
+    owner  "mysql"
+    group  "mysql"
+  end
   link '/var/run/mysqld/mysqld.sock' do
     to socket
     not_if 'test -f /var/run/mysqld/mysqld.sock'

cookbooks/mediawiki/recipes/default.rb

@@ -10,7 +10,15 @@
 include_recipe "apt"
 
 include_recipe "php::default"
-include_recipe "php::module_apc"
+
+if node['platform'] == 'ubuntu' and node['platform_version'] >= '16.04'
+  # APC is now apcu in PHP 7
+  include_recipe "php::module_apcu"
+  # Dependency
+  package "php7.0-mbstring"
+else
+  include_recipe "php::module_apc"
+end
 include_recipe "php::module_mysql"
 
 include_recipe "mediawiki::database"
@@ -38,8 +46,11 @@ when "debian"
   package "libicu-dev"
 end
 
-php_pear "intl" do
-  action :install
+if platform?('ubuntu') && node[:platform_version].to_f < 16.04
+  # bundled with PHP since version 5.3
+  php_pear "intl" do
+    action :install
+  end
 end
 
 # Configure mediawiki database

cookbooks/mediawiki/recipes/nginx.rb

@@ -7,32 +7,7 @@ node.set_unless['php-fpm']['pools'] = []
 
 include_recipe "php-fpm"
 include_recipe 'php-fpm::repository' unless node['php-fpm']['skip_repository_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 :install
-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
+include_recipe "php-fpm::install"
 
 php_fpm_pool "www" do
   enable false