Merge branch 'main' into testing
This commit is contained in:
commit
735eaf7067
|
@ -5,7 +5,6 @@ define sunetdrive::db_type(
|
||||||
$location=undef,
|
$location=undef,
|
||||||
$override_config = undef,
|
$override_config = undef,
|
||||||
$override_compose = undef,
|
$override_compose = undef,
|
||||||
$replicate_rewrite_db = undef,
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -19,10 +19,6 @@ gtid_strict_mode = ON
|
||||||
log_bin = binlog
|
log_bin = binlog
|
||||||
log_slave_updates = ON
|
log_slave_updates = ON
|
||||||
server_id = <%= @server_id %>
|
server_id = <%= @server_id %>
|
||||||
<% if not @replicate_rewrite_db.nil? -%>
|
|
||||||
replicate-rewrite-db = "<%= @replicate_rewrite_db %>->nextcloud"
|
|
||||||
replicate-wild-do-table = <%= @replicate_rewrite_db %>.%
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
# Innodb
|
# Innodb
|
||||||
innodb_autoinc_lock_mode = 2
|
innodb_autoinc_lock_mode = 2
|
||||||
|
|
Loading…
Reference in a new issue