Skip to content

Commit

Permalink
Cleanup fpm config class
Browse files Browse the repository at this point in the history
  • Loading branch information
paescuj committed Jul 5, 2020
1 parent eb304ad commit 59b6d64
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions manifests/fpm/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -97,29 +97,31 @@

assert_private()

# Hack-ish to default to user for group too
$log_group_final = $log_group ? {
undef => $log_owner,
default => $log_group,
}

file { $config_file:
ensure => file,
content => template('php/fpm/php-fpm.conf.erb'),
owner => root,
owner => 'root',
group => $root_group,
mode => '0644',
}

ensure_resource('file', ['/var/run/php-fpm/', '/var/log/php-fpm/'], {
ensure_resource('file', '/var/run/php-fpm', {
ensure => directory,
owner => 'root',
group => $root_group,
mode => '0755',
})

ensure_resource('file', '/var/log/php-fpm/', {
ensure => directory,
owner => $user,
group => $group,
owner => 'root',
group => $root_group,
mode => $log_dir_mode,
})

file { $pool_base_dir:
ensure => directory,
owner => root,
owner => 'root',
group => $root_group,
mode => '0755',
}
Expand Down

0 comments on commit 59b6d64

Please sign in to comment.