From f8ba0e4efcddecf4f2e2b7e84a0237cd2f6a7914 Mon Sep 17 00:00:00 2001 From: Michael Burgess Date: Thu, 6 Aug 2026 20:08:35 -0400 Subject: [PATCH] Rename ssl config key to flags --- sample-config.yml | 61 +++++++++++++++++++ .../store/mariadb/MariadbStatsStore.java | 4 +- .../stats/store/mysql/MysqlStatsStore.java | 4 +- src/main/resources/config.yml | 6 +- .../store/mariadb/MariadbStatsStoreTest.java | 2 +- .../store/mysql/MysqlStatsStoreTest.java | 2 +- 6 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 sample-config.yml diff --git a/sample-config.yml b/sample-config.yml new file mode 100644 index 0000000..c34323a --- /dev/null +++ b/sample-config.yml @@ -0,0 +1,61 @@ +#---------------------------------------------------------------------- +# The store is where all the collected data is kept. Different store +# types are supported: +# +# - sqlite: stores stats in an SQLite database +# - mysql: stores stats in a MySQL/MariaDB database +# - csv: stores stats in local CSV files +# +# Stores may require configuration of additional properties, such as +# file paths or database credentials. +#---------------------------------------------------------------------- +store: + + #-------------------------------------------------------------------- + # Which type of store to use. + # + # Changing this value will _not_ result in an automatic conversion + # of existing store data. To transfer data to a different store, + # make an export of the current store first, then change type and + # import the exported data. + # + type: mysql + #-------------------------------------------------------------------- + + #-------------------------------------------------------------------- + # SQLite store properties + # + # - filename: name of the database file, relative to plugin folder + # + #filename: stats.db + #-------------------------------------------------------------------- + + #-------------------------------------------------------------------- + # MySQL/MariaDB store properties + # + # - host: where the database instance is hosted + # - port: database port number + # - database: name of the database (must exist!) + # - username: username of a valid database user + # - password: password of a valid database user + # - flags: extra JDBC connection parameters, appended to the URL as-is + # (e.g. 'verifyServerCertificate=false&sslmode=required'). + # Leave blank/omit to append no extra parameters. + # + host: localhost + port: 3306 + database: mobarena_stats + username: mobarena + password: 'change-me' + flags: 'verifyServerCertificate=false&sslmode=required' + #-------------------------------------------------------------------- + + #-------------------------------------------------------------------- + # CSV store properties + # + # - folder: where to store data files, relative to plugin folder + # - separator: symbol to separate fields and values with + # + #folder: data + #separator: ';' + #-------------------------------------------------------------------- diff --git a/src/main/java/org/mobarena/stats/store/mariadb/MariadbStatsStore.java b/src/main/java/org/mobarena/stats/store/mariadb/MariadbStatsStore.java index 20f74ac..3a27362 100644 --- a/src/main/java/org/mobarena/stats/store/mariadb/MariadbStatsStore.java +++ b/src/main/java/org/mobarena/stats/store/mariadb/MariadbStatsStore.java @@ -29,11 +29,11 @@ public class MariadbStatsStore { String host = config.getString("host", "localhost"); int port = config.getInt("port", 3306); String database = config.getString("database", "mobarena_stats"); - String ssl = config.getString("ssl", ""); + String flags = config.getString("flags", ""); String url = "jdbc:mariadb://" + host + ":" + port + "/" + database; - return ssl.isEmpty() ? url : url + "?" + ssl; + return flags.isEmpty() ? url : url + "?" + flags; } } diff --git a/src/main/java/org/mobarena/stats/store/mysql/MysqlStatsStore.java b/src/main/java/org/mobarena/stats/store/mysql/MysqlStatsStore.java index 504db72..3be9a67 100644 --- a/src/main/java/org/mobarena/stats/store/mysql/MysqlStatsStore.java +++ b/src/main/java/org/mobarena/stats/store/mysql/MysqlStatsStore.java @@ -27,11 +27,11 @@ public class MysqlStatsStore { String host = config.getString("host", "localhost"); int port = config.getInt("port", 3306); String database = config.getString("database", "mobarena_stats"); - String ssl = config.getString("ssl", ""); + String flags = config.getString("flags", ""); String url = "jdbc:mysql://" + host + ":" + port + "/" + database; - return ssl.isEmpty() ? url : url + "?" + ssl; + return flags.isEmpty() ? url : url + "?" + flags; } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 728988e..eeda974 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -38,15 +38,15 @@ store: # - database: name of the database (must exist!) # - username: username of a valid database user # - password: password of a valid database user - # - ssl: extra JDBC connection parameters, appended to the URL as-is - # (e.g. 'verifyServerCertificate=false&sslmode=required') + # - flags: extra JDBC connection parameters, appended to the URL as-is + # (e.g. 'verifyServerCertificate=false&sslmode=required') # #host: localhost #port: 3306 #database: '' #username: '' #password: '' - #ssl: '' + #flags: '' #-------------------------------------------------------------------- #-------------------------------------------------------------------- diff --git a/src/test/java/org/mobarena/stats/store/mariadb/MariadbStatsStoreTest.java b/src/test/java/org/mobarena/stats/store/mariadb/MariadbStatsStoreTest.java index 681c164..ca32591 100644 --- a/src/test/java/org/mobarena/stats/store/mariadb/MariadbStatsStoreTest.java +++ b/src/test/java/org/mobarena/stats/store/mariadb/MariadbStatsStoreTest.java @@ -26,7 +26,7 @@ class MariadbStatsStoreTest { config.set("host", "stats.example.com"); config.set("port", 1337); config.set("database", "mastats"); - config.set("ssl", "verifyServerCertificate=false&sslmode=required"); + config.set("flags", "verifyServerCertificate=false&sslmode=required"); String result = MariadbStatsStore.getUrl(config); diff --git a/src/test/java/org/mobarena/stats/store/mysql/MysqlStatsStoreTest.java b/src/test/java/org/mobarena/stats/store/mysql/MysqlStatsStoreTest.java index 5ceb644..9a062c4 100644 --- a/src/test/java/org/mobarena/stats/store/mysql/MysqlStatsStoreTest.java +++ b/src/test/java/org/mobarena/stats/store/mysql/MysqlStatsStoreTest.java @@ -26,7 +26,7 @@ class MysqlStatsStoreTest { config.set("host", "stats.example.com"); config.set("port", 1337); config.set("database", "mastats"); - config.set("ssl", "verifyServerCertificate=false&sslmode=required"); + config.set("flags", "verifyServerCertificate=false&sslmode=required"); String result = MysqlStatsStore.getUrl(config);