diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f444784..3ef10e66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release. * redis: max clients is configurable * generate-ldif: support MariaDB 10.3 * mysql: activate binary logs by specifying log_bin path +* mysql: specify a custom server_id ### Changed * elasticsearch: listen on local interface only by default diff --git a/mysql/README.md b/mysql/README.md index 90025175..ff4fcbe9 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -31,6 +31,7 @@ Tasks are extracted in several files, included in `tasks/main.yml` : * `mysql_query_cache_limit`: (default: `Null`, default evolinux config is then used) ; * `mysql_query_cache_size`: (default: `Null`, default evolinux config is then used) ; * `mysql_log_bin`: (default: `Null`, activates binlogs if used) ; +* `mysql_server_id`: (default: `Null`, MySQL version default is then used) ; * `mysql_custom_datadir`: custom datadir. * `mysql_custom_tmpdir`: custom tmpdir. * `general_alert_email`: email address to send various alert messages (default: `root@localhost`). diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml index cd0dec38..633619cf 100644 --- a/mysql/defaults/main.yml +++ b/mysql/defaults/main.yml @@ -30,6 +30,7 @@ mysql_max_heap_table_size: Null mysql_query_cache_limit: Null mysql_query_cache_size: Null mysql_log_bin: Null +mysql_server_id: Null mysql_cron_optimize: True mysql_cron_optimize_frequency: weekly diff --git a/mysql/templates/evolinux-custom.cnf.j2 b/mysql/templates/evolinux-custom.cnf.j2 index 044427bf..f8ee104e 100644 --- a/mysql/templates/evolinux-custom.cnf.j2 +++ b/mysql/templates/evolinux-custom.cnf.j2 @@ -32,3 +32,6 @@ query_cache_size = {{ mysql_query_cache_size }} {% if mysql_log_bin %} log_bin = {{ mysql_log_bin }} {% endif %} +{% if mysql_server_id %} +server_id = {{ mysql_server_id }} +{% endif %}