From afb4724eca42c3ebe251a00435392bf4693c7bcd Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 17 Apr 2019 12:18:44 +1000 Subject: [PATCH] DCD-224: Use UTF-8 for all encodings. --- group_vars/all.yml | 4 ++-- roles/database_config/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index cc7fe82..2177239 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -40,8 +40,8 @@ atl_jdbc_db_name: "{{ lookup('env', 'ATL_JDBC_DB_NAME') }}" atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}" atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}" atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}" -atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US' }}" -atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US' }}" +atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US.UTF-8' }}" +atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US.UTF-8' }}" atl_jdbc_template: "{{ lookup('env', 'ATL_JDBC_TEMPLATE') or 'template1' }}" atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}" diff --git a/roles/database_config/defaults/main.yml b/roles/database_config/defaults/main.yml index fe3e10f..2c77b62 100644 --- a/roles/database_config/defaults/main.yml +++ b/roles/database_config/defaults/main.yml @@ -3,6 +3,6 @@ atl_db_port: '5432' atl_db_root_user: 'postgres' atl_jdbc_encoding: 'UTF-8' -atl_jdbc_collation: 'en_US' -atl_jdbc_ctype: 'en_US' +atl_jdbc_collation: 'en_US.UTF-8' +atl_jdbc_ctype: 'en_US.UTF-8' atl_jdbc_template: 'template1'