DCD-1123: Move DB encoding default into group vars.

This commit is contained in:
Steve Smith
2020-10-22 14:47:01 +11:00
parent 7485228145
commit 0a662d86b8
2 changed files with 4 additions and 4 deletions

View File

@@ -15,6 +15,10 @@ atl_installer_temp: "{{ atl_installation_base }}/tmp"
atl_db_type: "postgres72" atl_db_type: "postgres72"
atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}/{{ atl_jdbc_db_name }}" atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}/{{ atl_jdbc_db_name }}"
atl_db_driver: "org.postgresql.Driver" 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_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
atl_java_binary: "{{ atl_java_home }}/bin/java" atl_java_binary: "{{ atl_java_home }}/bin/java"

View File

@@ -22,10 +22,6 @@
atl_jdbc_user: "confluence" atl_jdbc_user: "confluence"
atl_jdbc_db_name: "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_jvm_heap: "12288m"
atl_use_system_jdk: true atl_use_system_jdk: true
atl_download_format: "tarball" atl_download_format: "tarball"