diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-11-27 10:09:19 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-11-27 10:09:19 -0200 |
| commit | 22d1ce2d3e574a52ee0af41a9ca95e3d6ba6c00c (patch) | |
| tree | b89f12cb81c86997bd240691189190ca19914db6 /manifests | |
| parent | 0fdb47fe6092bc6d453927e722bea9b6318a9447 (diff) | |
| download | puppet-apache-22d1ce2d3e574a52ee0af41a9ca95e3d6ba6c00c.tar.gz puppet-apache-22d1ce2d3e574a52ee0af41a9ca95e3d6ba6c00c.tar.bz2 | |
Drop vserver support
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 |