From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 2 Aug 2015 15:51:46 +0000 (-0300)
Subject: Envvars LANG issue
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=21856ac09c821889499d3fb75a6d75f2570f5b26;p=puppet-apache.git

Envvars LANG issue
---

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