From 9408a8f38e14c9c7b8fee726938549ab3ab10cf1 Mon Sep 17 00:00:00 2001 From: matsduf Date: Tue, 9 Jan 2018 14:44:35 +0100 Subject: [PATCH] Adjusting the locale environment before the daemons are started to make sure language selection works. (#347) This adjustment affects Ubuntu, Debian and CentOS, but not FreeBSD, since the available start files are not used by FreeBSD. --- share/zm-backend.sh-mysql | 7 +++++++ share/zm-backend.sh-postgresql | 7 +++++++ share/zm-centos.sh-mysql | 7 +++++++ share/zm-centos.sh-postgresql | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/share/zm-backend.sh-mysql b/share/zm-backend.sh-mysql index c769f5f64..6f329d7f9 100755 --- a/share/zm-backend.sh-mysql +++ b/share/zm-backend.sh-mysql @@ -14,6 +14,13 @@ # database engine. ### END INIT INFO +# Unset potentially conflicting locale, setting the default +unset LANGUAGE +unset LANG +unset LC_MESSAGES +unset LC_ALL +export LC_CTYPE="en_US.UTF-8" + LOGDIR=/var/log/zonemaster PIDDIR=/var/run/zonemaster LISTENIP=127.0.0.1 diff --git a/share/zm-backend.sh-postgresql b/share/zm-backend.sh-postgresql index a268f04b0..87c83f797 100755 --- a/share/zm-backend.sh-postgresql +++ b/share/zm-backend.sh-postgresql @@ -14,6 +14,13 @@ # database engine. ### END INIT INFO +# Unset potentially conflicting locale, setting the default +unset LANGUAGE +unset LANG +unset LC_MESSAGES +unset LC_ALL +export LC_CTYPE="en_US.UTF-8" + LOGDIR=/var/log/zonemaster PIDDIR=/var/run/zonemaster LISTENIP=127.0.0.1 diff --git a/share/zm-centos.sh-mysql b/share/zm-centos.sh-mysql index 0e8223cdb..a86ffb09f 100644 --- a/share/zm-centos.sh-mysql +++ b/share/zm-centos.sh-mysql @@ -13,6 +13,13 @@ # make up the Zonemaster Backend. ### END INIT INFO +# Unset potentially conflicting locale, setting the default +unset LANGUAGE +unset LANG +unset LC_MESSAGES +unset LC_ALL +export LC_CTYPE="en_US.UTF-8" + LOGDIR=/var/log/zonemaster PIDDIR=/var/run/zonemaster LISTENIP=127.0.0.1 diff --git a/share/zm-centos.sh-postgresql b/share/zm-centos.sh-postgresql index 48456cd9a..045343a87 100644 --- a/share/zm-centos.sh-postgresql +++ b/share/zm-centos.sh-postgresql @@ -13,6 +13,13 @@ # make up the Zonemaster Backend. ### END INIT INFO +# Unset potentially conflicting locale, setting the default +unset LANGUAGE +unset LANG +unset LC_MESSAGES +unset LC_ALL +export LC_CTYPE="en_US.UTF-8" + LOGDIR=/var/log/zonemaster PIDDIR=/var/run/zonemaster LISTENIP=127.0.0.1