From 22d1ce2d3e574a52ee0af41a9ca95e3d6ba6c00c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Nov 2016 10:09:19 -0200
Subject: Drop vserver support

---
 manifests/init.pp | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'manifests/init.pp')

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
-- 
cgit v1.2.3