diff --git a/README.md b/README.md index 961f74e26..e0dec25c8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The functionality that was previously in the nagios::client recipe has been move - apache2 4.0 or greater - build-essential -- chef_nginx +- nginx - php - yum-epel diff --git a/metadata.rb b/metadata.rb index 136c6e1f6..0b1f9c651 100644 --- a/metadata.rb +++ b/metadata.rb @@ -13,10 +13,11 @@ recipe 'nagios::pagerduty', 'Integrates contacts w/ PagerDuty API' depends 'apache2', '>= 4.0' +depends 'nginx', '>= 7.0' depends 'php-fpm', '>= 0.7.9' depends 'zap', '>= 0.6.0' -%w( build-essential php chef_nginx yum-epel nrpe ).each do |cb| +%w( build-essential php yum-epel nrpe ).each do |cb| depends cb end diff --git a/recipes/nginx.rb b/recipes/nginx.rb index 5a2046d6f..d8dc41e8b 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -18,7 +18,7 @@ node.default['nagios']['server']['web_server'] = 'nginx' -include_recipe 'chef_nginx' +include_recipe 'nginx' node.default['php-fpm']['pools']['www']['user'] = node['nginx']['user'] node.default['php-fpm']['pools']['www']['group'] = node['nginx']['group']