Skip to content

Commit

Permalink
fix name collision with php cookbook
Browse files Browse the repository at this point in the history
  • Loading branch information
axos88 committed Jan 29, 2020
1 parent 49770b9 commit 5f6694e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Cookbook Name:: php-fpm
# Definition:: php_fpm_pool
# Definition:: php_fpm_fpm_pool
#
# Copyright 2008-2017, Chef Software, Inc.
#
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion recipes/configure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f6694e

Please sign in to comment.