Merge branch 'main' into testing
This commit is contained in:
commit
35362991d0
|
@ -33,7 +33,7 @@ define sunetdrive::db_type(
|
||||||
$ports = [3306, 4444, 4567, 4568]
|
$ports = [3306, 4444, 4567, 4568]
|
||||||
if $location =~ /^multinode/ {
|
if $location =~ /^multinode/ {
|
||||||
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['kube'] + $config['kube_v6']
|
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['kube'] + $config['kube_v6']
|
||||||
} elsif $location == 'sunet-test' {
|
} elsif $location == 'sunet-test' or $location == 'sunet-prod' {
|
||||||
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $config['smtp'] + $config['smtp_v6']
|
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $config['smtp'] + $config['smtp_v6']
|
||||||
} else {
|
} else {
|
||||||
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6
|
$from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6
|
||||||
|
|
Loading…
Reference in a new issue