From 0a662d86b87003f350209a2fbdc7e5a0263c220b Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 22 Oct 2020 14:47:01 +1100
Subject: [PATCH] DCD-1123: Move DB encoding default into group vars.

---
 group_vars/standalone_instances.yml | 4 ++++
 test_migration_confluence.yml       | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/group_vars/standalone_instances.yml b/group_vars/standalone_instances.yml
index 89903e5..900ec39 100644
--- a/group_vars/standalone_instances.yml
+++ b/group_vars/standalone_instances.yml
@@ -15,6 +15,10 @@ atl_installer_temp: "{{ atl_installation_base }}/tmp"
 atl_db_type: "postgres72"
 atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}/{{ atl_jdbc_db_name }}"
 atl_db_driver: "org.postgresql.Driver"
+atl_jdbc_encoding: "UTF-8"
+atl_jdbc_collation: "en_US.UTF-8"
+atl_jdbc_ctype: "en_US.UTF-8"
+atl_jdbc_template: "template1"
 
 atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
 atl_java_binary: "{{ atl_java_home }}/bin/java"
diff --git a/test_migration_confluence.yml b/test_migration_confluence.yml
index 05b73c4..879e272 100644
--- a/test_migration_confluence.yml
+++ b/test_migration_confluence.yml
@@ -22,10 +22,6 @@
     atl_jdbc_user: "confluence"
     atl_jdbc_db_name: "confluence"
 
-    atl_jdbc_encoding: 'UTF-8'
-    atl_jdbc_collation: 'en_US.UTF-8'
-    atl_jdbc_template: 'template0'
-
     atl_jvm_heap: "12288m"
     atl_use_system_jdk: true
     atl_download_format: "tarball"