From 5f6694e1febedf4772148390f87fda3a08fa1afa Mon Sep 17 00:00:00 2001
From: Akos Vandra <axos88@gmail.com>
Date: Wed, 29 Jan 2020 23:02:48 +0100
Subject: [PATCH] fix name collision with php cookbook

---
 README.md                                            | 6 +++---
 definitions/{php_fpm_pool.rb => php_fpm_fpm_pool.rb} | 4 ++--
 recipes/configure.rb                                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename definitions/{php_fpm_pool.rb => php_fpm_fpm_pool.rb} (96%)

diff --git a/README.md b/README.md
index a503473..ac81a30 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ override_attributes "php-fpm" => {
 ## Create PHP-FPM pool named 'www' with default settings:
 
 ```ruby
-php_fpm_pool "www"
+php_fpm_fpm_pool "www"
 ```
 
 ## Create PHP-FPM pool named 'www' with custom settings:
 
 ```ruby
-php_fpm_pool "www" do
+php_fpm_fpm_pool "www" do
   cookbook "another-cookbook" # get template from another cookbook
   process_manager "dynamic"
   max_requests 5000
@@ -74,7 +74,7 @@ end
 ## Delete PHP-FPM pool named 'www':
 
 ```ruby
-php_fpm_pool "www" do
+php_fpm_fpm_pool "www" do
   enable false
 end
 ```
diff --git a/definitions/php_fpm_pool.rb b/definitions/php_fpm_fpm_pool.rb
similarity index 96%
rename from definitions/php_fpm_pool.rb
rename to definitions/php_fpm_fpm_pool.rb
index 27ed004..2b6cea4 100644
--- a/definitions/php_fpm_pool.rb
+++ b/definitions/php_fpm_fpm_pool.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: php-fpm
-# Definition:: php_fpm_pool
+# Definition:: php_fpm_fpm_pool
 #
 # Copyright 2008-2017, Chef Software, Inc.
 #
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-define :php_fpm_pool, template: 'pool.conf.erb', enable: true do
+define :php_fpm_fpm_pool, template: 'pool.conf.erb', enable: true do
   pool_name = params[:name]
 
   conf_file = "#{node['php-fpm']['pool_conf_dir']}/#{pool_name}.conf"
diff --git a/recipes/configure.rb b/recipes/configure.rb
index 26bfb8d..880a358 100644
--- a/recipes/configure.rb
+++ b/recipes/configure.rb
@@ -34,7 +34,7 @@
     else
       pool_name = pool[:name]
     end
-    php_fpm_pool pool_name do
+    php_fpm_fpm_pool pool_name do
       pool.each do |k, v|
         params[k.to_sym] = v
       end