Drive/sunetdrive
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into stable

Browse source
This commit is contained in:
Micke Nordin 2023-02-17 17:04:28 +01:00
commit 5ac40a8bbe
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/app_type.pp
View file

@ -334,15 +334,18 @@ define sunetdrive::app_type (
compose_filename => 'docker-compose.yml', compose_filename => 'docker-compose.yml',
description => 'Nextcloud application', description => 'Nextcloud application',
} }
sunet::misc::ufw_allow { 'https': if $::facts['sunet_nftables_enabled'] == 'yes' {
from => '0.0.0.0/0',
port => 443,
}
sunet::nftables::docker_expose { 'https': sunet::nftables::docker_expose { 'https':
allow_clients => ['any'], allow_clients => ['any'],
port => 443, port => 443,
iif => 'ens3', iif => 'ens3',
} }
} else {
sunet::misc::ufw_allow { 'https':
from => '0.0.0.0/0',
port => 443,
}
}
} }
} }

11
manifests/proxysql.pp
View file

@ -65,10 +65,7 @@ class sunetdrive::proxysql (
content => template('sunetdrive/proxysql/my.cnf.erb'), content => template('sunetdrive/proxysql/my.cnf.erb'),
mode => '0644', mode => '0644',
} }
sunet::misc::ufw_allow { 'stats_ports': if $::facts['sunet_nftables_enabled'] == 'yes' {
from => $tug_office,
port => 6080,
}
sunet::nftables::docker_expose { 'stats_ports': sunet::nftables::docker_expose { 'stats_ports':
allow_clients => $tug_office, allow_clients => $tug_office,
port => 6080, port => 6080,
@ -79,6 +76,12 @@ class sunetdrive::proxysql (
port => 6032, port => 6032,
iif => 'ens3', iif => 'ens3',
} }
} else {
sunet::misc::ufw_allow { 'stats_ports':
from => $tug_office,
port => 6080,
}
}
sunet::docker_compose { 'drive_proxysql_docker_compose': sunet::docker_compose { 'drive_proxysql_docker_compose':
content => template('sunetdrive/proxysql/docker-compose_proxysql.yml.erb'), content => template('sunetdrive/proxysql/docker-compose_proxysql.yml.erb'),