remove explicit LC_ALL environment variable setting that only works on some distros
This commit is contained in:
@@ -6,8 +6,7 @@
|
|||||||
command: pg_createcluster {{ version }} main
|
command: pg_createcluster {{ version }} main
|
||||||
test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf
|
test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf
|
||||||
user: root
|
user: root
|
||||||
env:
|
env: {}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
|
|
||||||
{{ ubuntu_block('wheezy', 9.1) }}
|
{{ ubuntu_block('wheezy', 9.1) }}
|
||||||
|
|||||||
@@ -26,6 +26,5 @@ postgres:
|
|||||||
user: root
|
user: root
|
||||||
command: service postgresql initdb
|
command: service postgresql initdb
|
||||||
test: test -f /var/lib/pgsql/data/PG_VERSION
|
test: test -f /var/lib/pgsql/data/PG_VERSION
|
||||||
env:
|
env: {}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,11 +5,9 @@ RedHat:
|
|||||||
repo_baseurl: http://yum.postgresql.org/9.4/redhat/rhel-$releasever-$basearch
|
repo_baseurl: http://yum.postgresql.org/9.4/redhat/rhel-$releasever-$basearch
|
||||||
prepare_cluster:
|
prepare_cluster:
|
||||||
test: test -f /var/lib/pgsql/data/PG_VERSION
|
test: test -f /var/lib/pgsql/data/PG_VERSION
|
||||||
env:
|
env: {}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
{% if grains['os_family'] == 'RedHat' %}
|
{% if grains['os_family'] == 'RedHat' %}
|
||||||
{% if grains['osmajorrelease'] >= 7 %}
|
{% if grains['osmajorrelease'] >= 7 %}
|
||||||
PGSETUP_INITDB_OPTIONS:
|
|
||||||
user: root
|
user: root
|
||||||
command: postgresql-setup initdb
|
command: postgresql-setup initdb
|
||||||
{% else %}
|
{% else %}
|
||||||
@@ -23,8 +21,7 @@ Arch:
|
|||||||
user: postgres
|
user: postgres
|
||||||
command: initdb -D /var/lib/postgresql/data
|
command: initdb -D /var/lib/postgresql/data
|
||||||
test: test -f /var/lib/postgres/data/PG_VERSION
|
test: test -f /var/lib/postgres/data/PG_VERSION
|
||||||
env:
|
env: {}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
pkg_client: postgresql
|
pkg_client: postgresql
|
||||||
pkg_dev: postgresql
|
pkg_dev: postgresql
|
||||||
Debian:
|
Debian:
|
||||||
|
|||||||
Reference in New Issue
Block a user