diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 6c12405..aa56585 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -265,24 +265,8 @@ class apache( refreshonly => true, } - # Avoid this logrotate error: - # /usr/sbin/apache2ctl: 87: ulimit: error setting limit (Operation not permitted) - file { '/etc/logrotate.d/apache2': - ensure => present, - owner => root, - group => root, - mode => 0644, - source => $::virtual ? { - 'vserver' => 'puppet:///modules/apache/logrotate', - default => undef, - }, - } - class { 'apache::envvars': - source => $::virtual ? { - 'vserver' => "puppet:///modules/apache/envvars.vserver.${::lsbdistcodename}", - default => "puppet:///modules/apache/envvars.${::lsbdistcodename}", - }, + source => "puppet:///modules/apache/envvars.${::lsbdistcodename}", } # Legacy configuration |