Merge branch 'main' into testing
This commit is contained in:
commit
fff058613a
1 changed files with 3 additions and 1 deletions
|
@ -12,6 +12,8 @@ class sunetdrive::proxysql (
|
||||||
$config = hiera_hash($environment)
|
$config = hiera_hash($environment)
|
||||||
$db_ip = $config['db']
|
$db_ip = $config['db']
|
||||||
$nextcloud_ip = $config['app']
|
$nextcloud_ip = $config['app']
|
||||||
|
$nextcloud_ipv6 = $config['app_v6']
|
||||||
|
$nextcloud_ip_all = $nextcloud_ip + $nextcloud_ipv6
|
||||||
$proxysql_ok_num = length($nextcloud_ip)
|
$proxysql_ok_num = length($nextcloud_ip)
|
||||||
$proxysql_warn_num = $proxysql_ok_num - 1
|
$proxysql_warn_num = $proxysql_ok_num - 1
|
||||||
|
|
||||||
|
@ -79,7 +81,7 @@ class sunetdrive::proxysql (
|
||||||
iif => 'ens3',
|
iif => 'ens3',
|
||||||
}
|
}
|
||||||
sunet::nftables::docker_expose { 'proxysql':
|
sunet::nftables::docker_expose { 'proxysql':
|
||||||
allow_clients => $nextcloud_ip,
|
allow_clients => $nextcloud_ip_all,
|
||||||
port => 6032,
|
port => 6032,
|
||||||
iif => 'ens3',
|
iif => 'ens3',
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue