Merge branch 'main' into testing

This commit is contained in:
Micke Nordin 2023-07-18 15:53:04 +02:00
commit 735eaf7067
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 0 additions and 5 deletions

View file

@ -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,
) )
{ {

View file

@ -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