Add missing changes for mediawiki upgrades

cookbooks/mediawiki/metadata.json

@@ -12,8 +12,7 @@
   "dependencies": {
     "apache2": ">= 0.0.0",
     "php": ">= 0.0.0",
-    "nginx": ">= 0.0.0",
-    "php-fpm": ">= 0.0.0"
+    "nginx": ">= 0.0.0"
   },
   "providing": {
 

cookbooks/mediawiki/metadata.rb

@@ -8,7 +8,6 @@ version          '0.5.0'
 depends          'apache2'
 depends          'php'
 depends          'nginx'
-depends          'php-fpm'
 
 attribute 'mediawiki/version',
 				:display_name	=> "Mediawiki version",

cookbooks/mediawiki/recipes/nginx.rb

@@ -3,30 +3,11 @@
 # Recipe:: nginx
 #
 
-node.default['php-fpm']['pools'] = []
-node.override['php-fpm']['package_name'] = "php-fpm"
-node.override['php-fpm']['service_name'] = "php7.2-fpm"
-node.override['php-fpm']['conf_dir'] = "/etc/php/7.2/fpm/conf.d"
-node.override['php-fpm']['pool_conf_dir'] = "/etc/php/7.2/fpm/pool.d"
-node.override['php-fpm']['conf_file'] = "/etc/php/7.2/fpm/php-fpm.conf"
-
-include_recipe "php-fpm"
-include_recipe 'php-fpm::repository' unless node['php-fpm']['skip_repository_install']
-include_recipe "php-fpm::install"
-
-php_fpm_pool "www" do
-  enable false
-end
-
 php_fpm_pool "mediawiki" do
   listen "127.0.0.1:9002"
   user node['nginx']['user']
   group node['nginx']['group']
-  listen_owner node['nginx']['user']
-  listen_group node['nginx']['group']
-  php_options node['mediawiki']['php_options']
-  start_servers 5
-  enable true
+  additional_config node['mediawiki']['php_options']
 end
 
 include_recipe "nginx"