summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-02 12:51:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-02 12:51:46 -0300
commit21856ac09c821889499d3fb75a6d75f2570f5b26 (patch)
tree0a661e93d19427590541a81a401a0bab2e422b83
parent2e4e62564c3cbb214b135acaaeb687ad114dbeea (diff)
downloadpuppet-apache-21856ac09c821889499d3fb75a6d75f2570f5b26.tar.gz
puppet-apache-21856ac09c821889499d3fb75a6d75f2570f5b26.tar.bz2
Envvars LANG issue
-rw-r--r--files/envvars5
-rw-r--r--files/envvars.vserver5
2 files changed, 8 insertions, 2 deletions
diff --git a/files/envvars b/files/envvars
index 91328ac..1cfcd64 100644
--- a/files/envvars
+++ b/files/envvars
@@ -25,7 +25,10 @@ export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
## The locale used by some modules like mod_dav
export LANG=C
## Uncomment the following line to use the system default locale instead:
-#. /etc/default/locale
+## 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
+. /etc/default/locale
export LANG
diff --git a/files/envvars.vserver b/files/envvars.vserver
index b5c749f..8ab7097 100644
--- a/files/envvars.vserver
+++ b/files/envvars.vserver
@@ -25,7 +25,10 @@ export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
## The locale used by some modules like mod_dav
export LANG=C
## Uncomment the following line to use the system default locale instead:
-#. /etc/default/locale
+## 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
+. /etc/default/locale
export LANG