Merge branch 'main' into testing
This commit is contained in:
commit
df4fe9985b
|
@ -230,7 +230,8 @@ MACAddressPolicy=none'
|
||||||
$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 {
|
||||||
$s3_bucket = "primary-${customer}-${environment}.sunet.se"
|
|
||||||
|
$s3_bucket = pick($customer_config["primary_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