Commit fcfd744c authored by Vincent Pelletier's avatar Vincent Pelletier

erp5.mariadb: Set server-id in configuration.

This allows enabling replication later without requiring a mariadb restart.
For now, nothing passes the internal server-id instance parameter, so
replication is not.
parent 1d526d30
......@@ -156,7 +156,7 @@ mode = 755
[template-mariadb]
<= download-base
filename = instance-mariadb.cfg.in
md5sum = fbc39d333bf70894f6f9d094515a2a4a
md5sum = ede2481d6ce60a335bde920d8cec5318
link-binary =
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
......@@ -192,7 +192,7 @@ md5sum = bc6048b85b410693e60e5a77399dd1b7
[template-my-cnf]
<= download-base
filename = my.cnf.in
md5sum = 9ae79a450f9760072ccbc8c9b2d0c377
md5sum = ac5c87991d95907f62bf2129ecfd42c4
[template-mariadb-initial-setup]
<= download-base
......
......@@ -114,6 +114,7 @@ relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }}
binlog-path = ${directory:mariadb-backup-incremental}/binlog
# XXX: binlog rotation happens along with other log's rotation
binlog-expire-days = {{ dumps(incremental_backup_retention_days) }}
server-id = {{ dumps(slapparameter_dict.get('server-id', 1)) }}
{% else %}
binlog-path =
{%- endif %}
......
......@@ -51,6 +51,7 @@ innodb_locks_unsafe_for_binlog = 1
log_bin = {{ log_bin }}
{% set binlog_expire_days = parameter_dict['binlog-expire-days'] -%}
{% if binlog_expire_days > 0 %}expire_logs_days = {{ binlog_expire_days }}{% endif %}
server_id = {{ parameter_dict['server-id'] }}
{% endif %}
# Some dangerous settings you may want to uncomment temporarily
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment