Skip to content

Commit cf5948f

Browse files
authored
issue #595 adding serverTimezone for logger-service and collectory templates to support mysql connector 8.0 .22 (#596)
1 parent df139a9 commit cf5948f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ansible/roles/collectory/templates/config/collectory-config.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ chartsBgColour={{ charts_bg_colour | default('#fffef7') }}
6565
# DB config
6666
dataSource.username={{ collectory_db_user }}
6767
dataSource.password={{ collectory_db_password }}
68-
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)}}
68+
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')}}
6969

7070
# Map config
7171
collectionsMap.centreMapLon={{ collections_map_lon | default('-3.7036') }}

ansible/roles/logger-service/templates/logger-config.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dataSource.dialect=org.hibernate.dialect.MySQL8Dialect
3838
{% else %}
3939
dataSource.driverClassName=com.mysql.jdbc.Driver
4040
{% endif %}
41-
dataSource.url=jdbc\:mysql\://{{logger_db_hostname}}/{{logger_db_name}}?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8
41+
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')}}
4242
dataSource.username={{logger_db_username}}
4343
dataSource.password={{logger_db_password}}
4444

0 commit comments

Comments
 (0)