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

Merge branch 'main' into testing

Browse source
This commit is contained in:
Micke Nordin 2024-04-29 16:39:41 +02:00
parent 01fc5a9e86 27d0bc15cc
commit 5ba11977b0
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/multinode.pp
View file

@ -219,6 +219,8 @@ MACAddressPolicy=none'
} }
} }
$customers.each | $index, $customer | { $customers.each | $index, $customer | {
$customer_config_full = hiera_hash($customer)
$customer_config = $customer_config_full[$environment]
cron { "multinode_cron_${customer}": cron { "multinode_cron_${customer}":
command => "/opt/nextcloud/cron.sh nextcloud-${customer}_app_1", command => "/opt/nextcloud/cron.sh nextcloud-${customer}_app_1",
require => File['/opt/nextcloud/cron.sh'], require => File['/opt/nextcloud/cron.sh'],
@ -226,11 +228,14 @@ MACAddressPolicy=none'
minute => '*/10', minute => '*/10',
} }
if $environment == 'prod' { if $environment == 'prod' {
$s3_bucket = "primary-${customer}-drive.sunet.se" if 'primary_bucket' in $customer_config.keys() {
$s3_bucket = $customer_config['primary_bucket']
} else {
$s3_bucket = "primary-${customer}-drive.sunet.se"
}
$site_name = "${customer}.drive.sunet.se" $site_name = "${customer}.drive.sunet.se"
$trusted_proxies = ['lb1.drive.sunet.se','lb2.drive.sunet.se', 'lb3.drive.sunet.se', 'lb4.drive.sunet.se'] $trusted_proxies = ['lb1.drive.sunet.se','lb2.drive.sunet.se', 'lb3.drive.sunet.se', 'lb4.drive.sunet.se']
} else { } else {
if 'primary_bucket' in $customer_config.keys() { if 'primary_bucket' in $customer_config.keys() {
$s3_bucket = $customer_config['primary_bucket'] $s3_bucket = $customer_config['primary_bucket']
} else { } else {
@ -244,8 +249,6 @@ MACAddressPolicy=none'
$apache_error_path = "/opt/multinode/${customer}/404.html" $apache_error_path = "/opt/multinode/${customer}/404.html"
$config_php_path = "/opt/multinode/${customer}/config.php" $config_php_path = "/opt/multinode/${customer}/config.php"
$cron_log_path ="/opt/multinode/${customer}/cron.log" $cron_log_path ="/opt/multinode/${customer}/cron.log"
$customer_config_full = hiera_hash($customer)
$customer_config = $customer_config_full[$environment]
$dbhost = 'proxysql_proxysql_1' $dbhost = 'proxysql_proxysql_1'
$dbname = "nextcloud_${customer}" $dbname = "nextcloud_${customer}"