Merge branch 'master' of git.nordu.net:eid-ops

This commit is contained in:
Leif Johansson 2018-10-30 14:56:36 +01:00
commit ba25e66a06

View file

@ -2,8 +2,8 @@
sunet_frontend: sunet_frontend:
load_balancer: load_balancer:
api_imagetag: 'staging' api_imagetag: 'stable'
exabgp_imagetag: 'staging' exabgp_imagetag: 'stable'
port80_acme_c_backend: 'letsencrypt_acme-c.sunet.se' port80_acme_c_backend: 'letsencrypt_acme-c.sunet.se'
static_backends: static_backends:
letsencrypt_acme-c.sunet.se.se: letsencrypt_acme-c.sunet.se.se:
@ -50,7 +50,7 @@ sunet_frontend:
allow_ports: allow_ports:
- 443 - 443
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'staging' haproxy_imagetag: 'stable'
'mdeidas': 'mdeidas':
site_name: 'md.eidas.swedenconnect.se' site_name: 'md.eidas.swedenconnect.se'
@ -70,7 +70,7 @@ sunet_frontend:
allow_ports: allow_ports:
- 443 - 443
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'staging' haproxy_imagetag: 'stable'
'test': 'test':
site_name: 'test.swedenconnect.se' site_name: 'test.swedenconnect.se'
@ -90,7 +90,7 @@ sunet_frontend:
allow_ports: allow_ports:
- 443 - 443
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'staging' haproxy_imagetag: 'stable'
'proxy': 'proxy':
site_name: 'proxy.eidas.swedenconnect.se' site_name: 'proxy.eidas.swedenconnect.se'
@ -116,7 +116,7 @@ sunet_frontend:
allow_ports: allow_ports:
- 443 - 443
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'staging' haproxy_imagetag: 'stable'
'md': 'md':
site_name: 'md.swedenconnect.se' site_name: 'md.swedenconnect.se'
@ -136,4 +136,4 @@ sunet_frontend:
allow_ports: allow_ports:
- 443 - 443
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'staging' haproxy_imagetag: 'stable'