summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-02-28 00:10:51 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-02-28 00:10:51 -0300
commitb1ce037ab632a5813eedd168387ec80843dc1ca0 (patch)
tree233612d2816958c233de17f493861f9173e9ad58 /manifests
parentceacbb9189f865f2ef22894942636e7e78724840 (diff)
downloadpuppet-puppet-b1ce037ab632a5813eedd168387ec80843dc1ca0.tar.gz
puppet-puppet-b1ce037ab632a5813eedd168387ec80843dc1ca0.tar.bz2
Add custom envvars apache config
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master/passenger.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
index d14c2e7..1c1e678 100644
--- a/manifests/master/passenger.pp
+++ b/manifests/master/passenger.pp
@@ -7,6 +7,13 @@ class puppet::master::passenger {
include puppet::master::mongrel::disabled
}
+ # We need a custom envvars apache config to set correct LANG env, see
+ # https://projects.puppetlabs.com/issues/11303
+ # https://projects.puppetlabs.com/issues/11860
+ apache::envvars {
+ source => "puppet:///modules/puppet/envvars.${::lsbdistcodename}",
+ }
+
# then include puppet class
include puppet::daemon