summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-02 11:46:58 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-02 11:46:58 -0300
commit150d2fb83234bca36ef37a25dfb18ca6086494b5 (patch)
tree49f791e2e232e46a13b679f8ded9f3fb5f333013 /manifests
parent26030ac3b7117a33b9f87fabe40c49d1398f331b (diff)
downloadpuppet-apache-150d2fb83234bca36ef37a25dfb18ca6086494b5.tar.gz
puppet-apache-150d2fb83234bca36ef37a25dfb18ca6086494b5.tar.bz2
Manage /etc/apache2/envvars on vservers
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp12
1 files changed, 12 insertions, 0 deletions
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,