From 600b43367f6c92374d98d63081c0f44d8c317c6e Mon Sep 17 00:00:00 2001 From: Sushant Date: Tue, 12 Jul 2022 15:02:14 +1000 Subject: [PATCH] =?UTF-8?q?issue=20#595=20adding=20serverTimezone=20for=20?= =?UTF-8?q?logger-service=20and=20collectory=20templates=20to=20support=20?= =?UTF-8?q?mysql=20connector=208.0=C2=A0.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectory/templates/config/collectory-config.properties | 2 +- ansible/roles/logger-service/templates/logger-config.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/collectory/templates/config/collectory-config.properties b/ansible/roles/collectory/templates/config/collectory-config.properties index d649ca161..cd0e5cd8c 100644 --- a/ansible/roles/collectory/templates/config/collectory-config.properties +++ b/ansible/roles/collectory/templates/config/collectory-config.properties @@ -65,7 +65,7 @@ chartsBgColour={{ charts_bg_colour | default('#fffef7') }} # DB config dataSource.username={{ collectory_db_user }} dataSource.password={{ collectory_db_password }} -dataSource.url=jdbc:mysql://{{ collectory_db_host_address }}:3306/collectory?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8&useSSL={{mysql_connection_ssl | default(false)}} +dataSource.url=jdbc:mysql://{{ collectory_db_host_address }}:3306/collectory?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8&useSSL={{mysql_connection_ssl | default(false)}}&serverTimezone={{server_tz | default('Australia/Sydney')}} # Map config collectionsMap.centreMapLon={{ collections_map_lon | default('-3.7036') }} diff --git a/ansible/roles/logger-service/templates/logger-config.properties b/ansible/roles/logger-service/templates/logger-config.properties index 84bf1672e..dbc095ede 100644 --- a/ansible/roles/logger-service/templates/logger-config.properties +++ b/ansible/roles/logger-service/templates/logger-config.properties @@ -38,7 +38,7 @@ dataSource.dialect=org.hibernate.dialect.MySQL8Dialect {% else %} dataSource.driverClassName=com.mysql.jdbc.Driver {% endif %} -dataSource.url=jdbc\:mysql\://{{logger_db_hostname}}/{{logger_db_name}}?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8 +dataSource.url=jdbc\:mysql\://{{logger_db_hostname}}/{{logger_db_name}}?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8&serverTimezone={{server_tz | default('Australia/Sydney')}} dataSource.username={{logger_db_username}} dataSource.password={{logger_db_password}}