Skip to content

Commit 082a6f8

Browse files
committed
fix anoying aug bug
1 parent 5f7654d commit 082a6f8

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

manifests/fpm/conf.pp

+2-6
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,21 @@
5858
# Hack-ish to default to user for group too
5959
$group_final = $group ? { undef => $user, default => $group }
6060

61-
if ( $ensure == 'absent' ) {
62-
61+
if ($ensure == 'absent') {
6362
file { "/etc/php5/fpm/pool.d/${pool}.conf":
6463
ensure => absent,
6564
notify => Service['php5-fpm']
6665
}
67-
6866
} else {
69-
7067
file { "/etc/php5/fpm/pool.d/${pool}.conf":
7168
ensure => file,
7269
notify => Service['php5-fpm'],
7370
require => Package['php5-fpm'],
7471
content => template('php/fpm/pool.conf.erb'),
7572
owner => root,
7673
group => root,
77-
mode => '0644',
74+
mode => '0644'
7875
}
79-
8076
}
8177

8278
}

templates/fpm/pool.conf.erb

+19-19
Original file line numberDiff line numberDiff line change
@@ -244,25 +244,25 @@ env[<%= key %>] = <%= value %>
244244
;php_admin_value[error_log] = /var/log/php-fpm/www-error.log
245245
;php_admin_flag[log_errors] = on
246246
;php_admin_value[memory_limit] = 32M
247-
<% if @error_log == true -%>
248-
php_admin_value[error_log] = /var/log/php-fpm/<%= @pool %>-error.log
249-
php_admin_flag[log_errors] = on
250-
<% elsif !@error_log.empty? -%>
251-
php_admin_value[error_log] = <%= @error_log %>
252-
php_admin_flag[log_errors] = on
253-
<% end -%>
254-
<% @php_value.sort_by {|key,value| key}.each do |key,value| -%>
255-
php_value[<%= key %>] = <%= value %>
256-
<% end -%>
257-
<% @php_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
258-
php_flag[<%= key %>] = <%= flag %>
259-
<% end -%>
260-
<% @php_admin_value.sort_by {|key,value| key}.each do |key,value| -%>
261-
php_admin_value[<%= key %>] = <%= value %>
262-
<% end -%>
263-
<% @php_admin_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
264-
php_admin_flag[<%= key %>] = <%= flag %>
265-
<% end -%>
247+
;<% if @error_log == true -%>
248+
;error_log = /var/log/php-fpm/<%= @pool %>-error.log
249+
;log_errors = on
250+
;<% elsif !@error_log.empty? -%>
251+
;error_log = <%= @error_log %>
252+
;log_errors = on
253+
;<% end -%>
254+
;<% @php_value.sort_by {|key,value| key}.each do |key,value| -%>
255+
;<%= key %> = <%= value %>
256+
;<% end -%>
257+
;<% @php_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
258+
;php_flag[<%= key %>] = <%= flag %>
259+
;<% end -%>
260+
;<% @php_admin_value.sort_by {|key,value| key}.each do |key,value| -%>
261+
;<%= key %> = <%= value %>
262+
;<% end -%>
263+
;<% @php_admin_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
264+
;<%= key %> = <%= flag %>
265+
;<% end -%>
266266
<% @php_directives.each do |line| -%>
267267
<%= line %>
268268
<% end -%>

0 commit comments

Comments
 (0)