Skip to content

Commit

Permalink
(MODULES-9104) Add file_mode to config files. (puppetlabs#1922)
Browse files Browse the repository at this point in the history
- ::apache::file_mode attribute is missing from several config files, including the main config file in ::apache, any custom config files managed by apache::custom_config, and reqtimeout.conf managed by apache::mod::reqtimeout
- Add "mode => $::apache::file_mode" to ::apache, apache::custom_config, and apache::mod::reqtimeout to correct the inability to manage the mode of these config files.
  • Loading branch information
stevegarn authored and Dave Seff committed Jun 13, 2019
1 parent 0b8edd4 commit 7a1ba95
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions manifests/custom_config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
file { "apache_${name}":
ensure => $ensure,
path => "${confdir}/${_filename}",
mode => $::apache::file_mode,
content => $content,
source => $source,
require => Package['httpd'],
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,7 @@
# - $root_directory_secured
file { "${::apache::conf_dir}/${::apache::params::conf_file}":
ensure => file,
mode => $::apache::file_mode,
content => template($conf_template),
notify => Class['Apache::Service'],
require => [Package['httpd'], Concat[$ports_file]],
Expand Down
1 change: 1 addition & 0 deletions manifests/mod/reqtimeout.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
file { 'reqtimeout.conf':
ensure => file,
path => "${::apache::mod_dir}/reqtimeout.conf",
mode => $::apache::file_mode,
content => template('apache/mod/reqtimeout.conf.erb'),
require => Exec["mkdir ${::apache::mod_dir}"],
before => File[$::apache::mod_dir],
Expand Down

0 comments on commit 7a1ba95

Please sign in to comment.