Merge branch 'main' into testing
This commit is contained in:
commit
01fc5a9e86
|
@ -231,7 +231,11 @@ MACAddressPolicy=none'
|
||||||
$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 {
|
||||||
|
|
||||||
$s3_bucket = pick($customer_config["primary_bucket"],"primary-${customer}-${environment}.sunet.se")
|
if 'primary_bucket' in $customer_config.keys() {
|
||||||
|
$s3_bucket = $customer_config['primary_bucket']
|
||||||
|
} else {
|
||||||
|
$s3_bucket = "primary-${customer}-${environment}.sunet.se"
|
||||||
|
}
|
||||||
$site_name = "${customer}.drive.${environment}.sunet.se"
|
$site_name = "${customer}.drive.${environment}.sunet.se"
|
||||||
$trusted_proxies = ["lb1.drive.${environment}.sunet.se","lb2.drive.${environment}.sunet.se",
|
$trusted_proxies = ["lb1.drive.${environment}.sunet.se","lb2.drive.${environment}.sunet.se",
|
||||||
"lb3.drive.${environment}.sunet.se","lb4.drive.${environment}.sunet.se"]
|
"lb3.drive.${environment}.sunet.se","lb4.drive.${environment}.sunet.se"]
|
||||||
|
|
Loading…
Reference in a new issue