From 90b993b782383f8b1d4e5d6ae92c6c8f49e452dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Tue, 3 Jul 2018 16:10:19 +0200 Subject: [PATCH 1/2] renamed website2 md.eidas to mdeidas --- fe-common/overlay/etc/hiera/data/group.yaml | 2 +- .../opt/frontend/config/{md.eidas => mdeidas}/haproxy.j2 | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename fe-common/overlay/opt/frontend/config/{md.eidas => mdeidas}/haproxy.j2 (100%) diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml index 07a4f0bc..f8a1b71c 100644 --- a/fe-common/overlay/etc/hiera/data/group.yaml +++ b/fe-common/overlay/etc/hiera/data/group.yaml @@ -52,7 +52,7 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'staging' - 'md.eidas': + 'mdeidas': site_name: 'md.eidas.swedenconnect.se' frontends: 'fe-fre-3.komreg.net': diff --git a/fe-common/overlay/opt/frontend/config/md.eidas/haproxy.j2 b/fe-common/overlay/opt/frontend/config/mdeidas/haproxy.j2 similarity index 100% rename from fe-common/overlay/opt/frontend/config/md.eidas/haproxy.j2 rename to fe-common/overlay/opt/frontend/config/mdeidas/haproxy.j2 From 698e687aece9f5c91e520fabfa7a6d42450c23e8 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 3 Jul 2018 16:33:07 +0200 Subject: [PATCH 2/2] Added two more backends For md.swedenconnet.se and md.eidas.swedenconnect.se sites --- fe-common/overlay/etc/hiera/data/group.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml index f8a1b71c..02b2a580 100644 --- a/fe-common/overlay/etc/hiera/data/group.yaml +++ b/fe-common/overlay/etc/hiera/data/group.yaml @@ -64,6 +64,9 @@ sunet_frontend: 'eupub-1.komreg.net': ips: ['94.176.224.200'] server_args: 'ssl check verify none' + 'eupub-2.komreg.net': + ips: ['94.176.224.72'] + server_args: 'ssl check verify none' allow_ports: - 443 letsencrypt_server: 'acme-c.sunet.se' @@ -81,8 +84,10 @@ sunet_frontend: 'natpub-1.komreg.net': ips: ['94.176.224.199'] server_args: 'ssl check verify none' + 'natpub-2.komreg.net': + ips: ['94.176.224.71'] + server_args: 'ssl check verify none' allow_ports: - 443 letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'staging' -