openstack/fuel-library
Code Issues Proposed changes

Merge "Do not inherit File owning permissions for apache module"

Browse Source
This commit is contained in:
Jenkins 2016-01-21 11:41:29 +00:00 committed by Gerrit Code Review
commit ab7476669b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deployment/puppet/osnailyfacter/manifests/apache.pp
View File

@ -49,16 +49,17 @@ class osnailyfacter::apache (
apache::listen { $listen_ports: } apache::listen { $listen_ports: }
File { # TODO (vvalyavskiy) Currently, it's not possible to specify owning parameters for File resource,
ensure => 'file', # cause it breaks apache logging process. Optimization can be returned as soon as pull request
owner => 'root', # will be merged - https://github.com/puppetlabs/puppetlabs-apache/pull/1340
group => 'root',
}
# we need to override the logrotate file provided by apache to work around # we need to override the logrotate file provided by apache to work around
# wsgi issues on the restart caused by logrotate. # wsgi issues on the restart caused by logrotate.
# LP#1491576 and https://github.com/GrahamDumpleton/mod_wsgi/issues/81 # LP#1491576 and https://github.com/GrahamDumpleton/mod_wsgi/issues/81
file { '/etc/logrotate.d/apache2': file { '/etc/logrotate.d/apache2':
ensure => 'file',
owner => 'root',
group => 'root',
mode => '0644', mode => '0644',
content => template('osnailyfacter/apache2.logrotate.erb'), content => template('osnailyfacter/apache2.logrotate.erb'),
require => Package['httpd'] require => Package['httpd']
@ -73,12 +74,17 @@ class osnailyfacter::apache (
$apache2_logrotate_delay = $delay[0] * 60 $apache2_logrotate_delay = $delay[0] * 60
file { '/etc/logrotate.d/httpd-prerotate': file { '/etc/logrotate.d/httpd-prerotate':
ensure => 'directory', ensure => 'directory',
mode => '0755', owner => 'root',
group => 'root',
mode => '0755',
} }
file { '/etc/logrotate.d/httpd-prerotate/apache2': file { '/etc/logrotate.d/httpd-prerotate/apache2':
ensure => 'file',
owner => 'root',
group => 'root',
mode => '0755', mode => '0755',
content => template('osnailyfacter/apache2.prerotate.erb'), content => template('osnailyfacter/apache2.prerotate.erb'),
} }
} }