Manage /etc/apache2/envvars on vservers

diff --git a/files/envvars b/files/envvars.vserver
similarity index 94%
rename from files/envvars
rename to files/envvars.vserver
index 91328ac72ab65c94e76eb4591c70cb60e4b8706e..b5c749f7327d81766e3bb1921910c1acd472ec3e 100644 (file)
--- a/files/envvars
+++ b/files/envvars.vserver
@@ -37,6 +37,9 @@ export LANG
 ## following line (default is 8192):
 #APACHE_ULIMIT_MAX_FILES='ulimit -n 65536'
 
+# Can't ulimit inside a vserver, so we avoid noise output at logrotate's cronjob
+APACHE_ULIMIT_MAX_FILES=''
+
 ## If you would like to pass arguments to the web server, add them below
 ## to the APACHE_ARGUMENTS environment.
 #export APACHE_ARGUMENTS=''

diff --git a/manifests/init.pp b/manifests/init.pp
index 2196b550b46cc0d1fbcc94eddf962bb792fdabca..d4ea4860659f6c918647f3d02a7ddbffefe33b97 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -226,6 +226,18 @@ class apache(
     },
   }
 
+  file { '/etc/apache2/envvars' :
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    source  => $::virtual ? {
+      'vserver' => 'puppet:///modules/apache/envvars.vserver',
+      default   => undef,
+    },
+    notify  => Service["apache"],
+  }
+
   # Legacy configuration
   file { "$conf_d/macros":
     ensure => absent,