From 7a7396fcb2f7899fbe79ddc5126c8d802360fc7f Mon Sep 17 00:00:00 2001
From: Jon Nelson <jdnelson@dyn.com>
Date: Tue, 19 Jul 2016 10:09:39 -0500
Subject: [PATCH] remove explicit LC_ALL environment variable setting that only
 works on some distros

---
 postgres/codenamemap.yaml | 3 +--
 postgres/defaults.yaml    | 3 +--
 postgres/osmap.yaml       | 7 ++-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index 9fa89be..88f0b8a 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -6,8 +6,7 @@
     command: pg_createcluster {{ version }} main
     test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf
     user: root
-    env:
-      LC_ALL: C.UTF-8
+    env: {}
 {%- endmacro %}
 
 {{ ubuntu_block('wheezy', 9.1) }}
diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 9c85efa..d35e17b 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -26,6 +26,5 @@ postgres:
     user: root
     command: service postgresql initdb
     test: test -f /var/lib/pgsql/data/PG_VERSION
-    env:
-      LC_ALL: C.UTF-8
+    env: {}
 
diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
index f5325c7..19fb77c 100644
--- a/postgres/osmap.yaml
+++ b/postgres/osmap.yaml
@@ -5,11 +5,9 @@ RedHat:
   repo_baseurl: http://yum.postgresql.org/9.4/redhat/rhel-$releasever-$basearch
   prepare_cluster:
     test: test -f /var/lib/pgsql/data/PG_VERSION
-    env:
-      LC_ALL: C.UTF-8
+    env: {}
 {% if grains['os_family'] == 'RedHat' %}
 {% if grains['osmajorrelease'] >= 7 %}
-      PGSETUP_INITDB_OPTIONS:
     user: root
     command: postgresql-setup initdb
 {% else %}
@@ -23,8 +21,7 @@ Arch:
     user: postgres
     command: initdb -D /var/lib/postgresql/data
     test: test -f /var/lib/postgres/data/PG_VERSION
-    env:
-      LC_ALL: C.UTF-8
+    env: {}
   pkg_client: postgresql
   pkg_dev: postgresql
 Debian: