diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 11:46:58 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 11:46:58 -0300 |
| commit | 150d2fb83234bca36ef37a25dfb18ca6086494b5 (patch) | |
| tree | 49f791e2e232e46a13b679f8ded9f3fb5f333013 | |
| parent | 26030ac3b7117a33b9f87fabe40c49d1398f331b (diff) | |
| download | puppet-apache-150d2fb83234bca36ef37a25dfb18ca6086494b5.tar.gz puppet-apache-150d2fb83234bca36ef37a25dfb18ca6086494b5.tar.bz2 | |
Manage /etc/apache2/envvars on vservers
| -rw-r--r-- | files/envvars.vserver (renamed from files/envvars) | 3 | ||||
| -rw-r--r-- | manifests/init.pp | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/files/envvars b/files/envvars.vserver index 91328ac..b5c749f 100644 --- 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 2196b55..d4ea486 100644 --- 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, |