From 5571c4f5d57ef92e06badc8f914212108588b066 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Tue, 26 Feb 2019 09:42:23 +0100
Subject: [PATCH 1/9] update db

---
 global/overlay/etc/puppet/cosmos-db.yaml | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 6c166c97..a8275dc4 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -433,92 +433,92 @@ classes:
       vms:
         eidas-connector-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid connector
           gateway: 94.176.224.129
           ip: 94.176.224.133
           mac: '52:54:20:01:04:01'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-connector-3.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid connector
           gateway: 94.176.224.129
           ip: 94.176.224.134
           mac: '52:54:20:01:04:02'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-proxy-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre proxy
           gateway: 94.176.224.129
           ip: 94.176.224.140
           mac: '52:54:20:01:04:08'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-proxy-3.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre proxy
           gateway: 94.176.224.129
           ip: 94.176.224.141
           mac: '52:54:20:01:04:09'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre redis cluster
           gateway: 94.176.224.129
           ip: 94.176.224.135
           mac: '52:54:20:01:04:03'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-3.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre redis cluster
           gateway: 94.176.224.129
           ip: 94.176.224.138
           mac: '52:54:20:01:04:06'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-fe-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre redis frontend
           gateway: 94.176.224.129
           ip: 94.176.224.137
           mac: '52:54:20:01:04:05'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-test-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid fre test SP
           gateway: 94.176.224.129
           ip: 94.176.224.139
           mac: '52:54:20:01:04:07'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         prid-1.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid prid
           gateway: 94.176.224.129
           ip: 94.176.224.136
           mac: '52:54:20:01:04:04'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
     entropyclient: null

From 3205c07342ae1e037746dbfd636f206f903df550 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Tue, 26 Feb 2019 09:47:01 +0100
Subject: [PATCH 2/9] Changed number of cpus and memory for the virtual
 machines inside kvmeidas-fre-3.komreg.net

---
 global/overlay/etc/puppet/cosmos-rules.yaml | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 68f1e879..c5fd6091 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -280,8 +280,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid connector'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-connector-3.sveidas.se:
             mac: '52:54:20:01:04:02'
             ip: '94.176.224.134'
@@ -290,8 +290,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid connector'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-1.sveidas.se:
             mac: '52:54:20:01:04:03'
             ip: '94.176.224.135'
@@ -300,8 +300,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre redis cluster'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-3.sveidas.se:
             mac: '52:54:20:01:04:06'
             ip: '94.176.224.138'
@@ -310,8 +310,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre redis cluster'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          prid-1.sveidas.se:
             mac: '52:54:20:01:04:04'
             ip: '94.176.224.136'
@@ -320,8 +320,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid prid'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-fe-1.sveidas.se:
             mac: '52:54:20:01:04:05'
             ip: '94.176.224.137'
@@ -330,8 +330,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre redis frontend'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-test-1.sveidas.se:
             mac: '52:54:20:01:04:07'
             ip: '94.176.224.139'
@@ -340,8 +340,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre test SP'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-proxy-1.sveidas.se:
             mac: '52:54:20:01:04:08'
             ip: '94.176.224.140'
@@ -350,8 +350,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre proxy'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-proxy-3.sveidas.se:
             mac: '52:54:20:01:04:09'
             ip: '94.176.224.141'
@@ -360,8 +360,8 @@ kvmeidas-fre-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid fre proxy'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
 
 
 monitor-fre-3.komreg.net:

From d0477d0f08b9a1b6bac17158309608402562a5b2 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Tue, 26 Feb 2019 16:02:41 +0100
Subject: [PATCH 3/9] update db

---
 global/overlay/etc/puppet/cosmos-db.yaml | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index a8275dc4..de086ced 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -533,92 +533,92 @@ classes:
       vms:
         eidas-connector-2.sveidas.se:
           bridge: br-eidas
-          cpus: '32'
+          cpus: '8'
           description: eid connector
           gateway: 94.176.224.1
           ip: 94.176.224.5
           mac: '52:54:20:02:04:01'
-          memory: '65536'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-connector-4.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid connector
           gateway: 94.176.224.1
           ip: 94.176.224.6
           mac: '52:54:20:02:04:02'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-proxy-2.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug proxy
           gateway: 94.176.224.1
           ip: 94.176.224.12
           mac: '52:54:20:02:04:08'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-proxy-4.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug proxy
           gateway: 94.176.224.1
           ip: 94.176.224.13
           mac: '52:54:20:02:04:09'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-2.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug redis cluster
           gateway: 94.176.224.1
           ip: 94.176.224.9
           mac: '52:54:20:02:04:05'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-4.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug redis cluster
           gateway: 94.176.224.1
           ip: 94.176.224.10
           mac: '52:54:20:02:04:06'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-redis-fe-2.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug redis frontend
           gateway: 94.176.224.1
           ip: 94.176.224.7
           mac: '52:54:20:02:04:03'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         eidas-test-2.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid tug test SP
           gateway: 94.176.224.1
           ip: 94.176.224.11
           mac: '52:54:20:02:04:07'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
         prid-2.sveidas.se:
           bridge: br-eidas
-          cpus: '4'
+          cpus: '8'
           description: eid prid
           gateway: 94.176.224.1
           ip: 94.176.224.8
           mac: '52:54:20:02:04:04'
-          memory: '4096'
+          memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
     entropyclient: null

From 343cd5aabfe3cbf3c32c4f46a5a9e5c8e91fa542 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Tue, 26 Feb 2019 16:03:58 +0100
Subject: [PATCH 4/9] Changed number of cpus and memory for the virtual
 machines inside kvmeidas-tug-3.komreg.net

---
 global/overlay/etc/puppet/cosmos-rules.yaml | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index c5fd6091..04d4842f 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -109,8 +109,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid connector'
-            cpus: '32'
-            memory: '65536'
+            cpus: '8'
+            memory: '8192'
          eidas-connector-4.sveidas.se:
             mac: '52:54:20:02:04:02'
             ip: '94.176.224.6'
@@ -119,8 +119,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid connector'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          prid-2.sveidas.se:
             mac: '52:54:20:02:04:04'
             ip: '94.176.224.8'
@@ -129,8 +129,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid prid'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-fe-2.sveidas.se:
             mac: '52:54:20:02:04:03'
             ip: '94.176.224.7'
@@ -139,8 +139,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug redis frontend'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-2.sveidas.se:
             mac: '52:54:20:02:04:05'
             ip: '94.176.224.9'
@@ -149,8 +149,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug redis cluster'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-redis-4.sveidas.se:
             mac: '52:54:20:02:04:06'
             ip: '94.176.224.10'
@@ -159,8 +159,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug redis cluster'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-test-2.sveidas.se:
             mac: '52:54:20:02:04:07'
             ip: '94.176.224.11'
@@ -169,8 +169,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug test SP'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-proxy-2.sveidas.se:
             mac: '52:54:20:02:04:08'
             ip: '94.176.224.12'
@@ -179,8 +179,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug proxy'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
          eidas-proxy-4.sveidas.se:
             mac: '52:54:20:02:04:09'
             ip: '94.176.224.13'
@@ -189,8 +189,8 @@ kvmeidas-tug-3.komreg.net:
             bridge: 'br-eidas'
             search: ['sveidas.se']
             description: 'eid tug proxy'
-            cpus: '4'
-            memory: '4096'
+            cpus: '8'
+            memory: '8192'
 
 
 kvmfe-fre-3.komreg.net:

From 9e90264cd700fd13a48a955615bcef3d3728845f Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Wed, 27 Feb 2019 12:48:17 +0100
Subject: [PATCH 5/9] update db

---
 global/overlay/etc/puppet/cosmos-db.yaml | 233 +++++++++++------------
 1 file changed, 106 insertions(+), 127 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index de086ced..83e9fd75 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -19,26 +19,6 @@ classes:
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
-  demw-1.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: null
-    eidas_de_middleware: {hostname: demw.eidas.swedenconnect.se, version: 1.0.7-qa}
-    entropyclient: null
-    infra_ca_rp: null
-    konsulter: null
-    mailclient: *id001
-    nrpe: null
-    saml_metadata: {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml,
-      url: 'https://connector.eidas.swedenconnect.se/idp/metadata/sp'}
-    sunet::frontend::register_sites:
-      sites:
-        demw.eidas.swedenconnect.se:
-          frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
-          port: '443'
-    sunet::rsyslog: null
-    sunet_iaas_cloud: null
-    sunetops: null
   eidas-connector-1.sveidas.se:
     autoupdate: null
     common: null
@@ -1062,7 +1042,7 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
 members:
-  all: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+  all: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
     eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
     eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
@@ -1079,68 +1059,68 @@ members:
     natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    jump-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
-    md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
-    monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
-    natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  common: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  autoupdate: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net,
+    md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net,
+    natmd-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se,
+    r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net,
+    web-1.qa.sveidas.se]
+  common: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
     natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se,
-    eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se,
-    eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se,
-    eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
-    eumd-1.komreg.net, eumd-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se]
+  eid::dockerhost: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-proxy-1.sveidas.se,
+    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
+    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net,
+    natmd-2.komreg.net, nic.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se,
+    test-1.qa.sveidas.se]
   eid::kvmhost: [kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
     kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net]
   eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se]
-  eidas_de_middleware: [demw-1.qa.sveidas.se, demw-1.sveidas.se]
+  eidas_de_middleware: [demw-1.qa.sveidas.se]
   eidas_hsm_client: [eumd-1.komreg.net, eumd-2.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net]
   eidas_log: [log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
   eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se]
-  entropyclient: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  entropyclient: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
@@ -1148,17 +1128,17 @@ members:
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   github_client_credential: [web-1.qa.sveidas.se]
-  infra_ca_rp: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  infra_ca_rp: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
@@ -1166,27 +1146,26 @@ members:
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
-  konsulter: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se,
-    log-2.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
-    natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se,
+  konsulter: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
+    eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    log-1.sveidas.se, log-2.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net,
+    md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se,
     prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net]
-  mailclient: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  mailclient: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
@@ -1205,7 +1184,7 @@ members:
     jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net]
   nagios_monitor: [monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, nic.komreg.net]
-  nrpe: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+  nrpe: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
     eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
     eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
@@ -1230,14 +1209,14 @@ members:
   redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
     eidas-redis-4.sveidas.se]
   redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se]
-  saml_metadata: [demw-1.qa.sveidas.se, demw-1.sveidas.se]
+  saml_metadata: [demw-1.qa.sveidas.se]
   servicemonitor: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
     prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, test-1.qa.sveidas.se]
   site_alias: [web-1.qa.sveidas.se]
   sunet::auditd: [jmp.komreg.net]
   sunet::frontend::load_balancer: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
-  sunet::frontend::register_sites: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
+  sunet::frontend::register_sites: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
     eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
     eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
@@ -1245,17 +1224,17 @@ members:
     natpub-1.komreg.net, natpub-2.komreg.net, p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se,
     test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   sunet::nagiosapi: [nic.komreg.net]
-  sunet::rsyslog: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  sunet::rsyslog: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-1.sveidas.se,
     log-2.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net,
     md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net,
@@ -1263,22 +1242,22 @@ members:
     p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se,
     r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net,
     web-1.qa.sveidas.se]
-  sunet_iaas_cloud: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  sunetops: [demw-1.qa.sveidas.se, demw-1.sveidas.se, eidas-connector-1.sveidas.se,
-    eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net,
-    kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net,
-    kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
+  sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
+    jmp.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net,
+    md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net,
+    web-1.qa.sveidas.se]
+  sunetops: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+    eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
+    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se,
+    eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se,
+    eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se,
+    eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net,
+    eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net,
+    kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,

From 1a1d1250c2f116cecebe9791b07f9a0edbcc7374 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Wed, 27 Feb 2019 12:49:25 +0100
Subject: [PATCH 6/9] removed demw-1.sveidas.se from eid-ops repository

---
 demw-1.sveidas.se/README                      |   1 -
 .../overlay/etc/hiera/data/local.yaml         |   3 --
 .../configuration/POSeIDAS.xml.sh             |  48 ------------------
 .../configuration/application.properties.sh   |  14 -----
 .../eidasmiddleware.properties.sh             |  22 --------
 .../configuration/metadata-signer-qa.crt      | Bin 1318 -> 0 bytes
 .../serviceprovider-metadata/.placeholder     |   0
 .../configuration/swedenconnect-signer.crt    |  35 -------------
 8 files changed, 123 deletions(-)
 delete mode 120000 demw-1.sveidas.se/README
 delete mode 100644 demw-1.sveidas.se/overlay/etc/hiera/data/local.yaml
 delete mode 100755 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
 delete mode 100755 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
 delete mode 100755 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
 delete mode 100644 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/metadata-signer-qa.crt
 delete mode 100644 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/serviceprovider-metadata/.placeholder
 delete mode 100644 demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/swedenconnect-signer.crt

diff --git a/demw-1.sveidas.se/README b/demw-1.sveidas.se/README
deleted file mode 120000
index 59a23c46..00000000
--- a/demw-1.sveidas.se/README
+++ /dev/null
@@ -1 +0,0 @@
-../README
\ No newline at end of file
diff --git a/demw-1.sveidas.se/overlay/etc/hiera/data/local.yaml b/demw-1.sveidas.se/overlay/etc/hiera/data/local.yaml
deleted file mode 100644
index 8ba33b95..00000000
--- a/demw-1.sveidas.se/overlay/etc/hiera/data/local.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-demw_tls_server_cert: MIIEcTCCA1mgAwIBAgIIDI0LEBD/wRIwDQYJKoZIhvcNAQELBQAwVzEnMCUGA1UEAwweYm9zIENBIGVJRCBDb21tdW5pY2F0aW9uIENlcnRzMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJERTAeFw0xMzA1MDcwNzQ5MjRaFw0xNjA1MDYwNzQ5MjRaMGgxHjAcBgNVBAMMFWRldi5nb3Zlcm5pa3VzLWVpZC5kZTEYMBYGA1UECwwPdGVzdGNlcnRpZmljYXRlMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJkZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9ea6dQveXgc23F7jteqN9L023MpOI7BnqD4YxsrOMfEhHBj1tcr1VpZgxtamhHKEJEqptN5ObotyA/wKqeIBEzLgfLGqMyPqnSyejELRql1KYi+moCgMWNiU5FAfhd29Rgr8rPhPtBSgkO7DQdXzaTQxDxQssUTlK5AifIl/f0+/emGZUknAIfXxgXlNmuSCijAt1qoNkd+VS05unQFYKqb3BfxFQDgHqdmg0caPDvb5KHYuTMGFhmRe3B8lt5ffM+QaIK8q+qTy2rU/4jS331tauGdxDv/JniOV2z5gzut4H42Naek9SPjgotk0ON8B4ZuSZf23pJ9GqRH1v9u+MCAwEAAaOCAS4wggEqMAwGA1UdEwEB/wQCMAAwPwYDVR0lBDgwNgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDDDAfBgNVHSMEGDAWgBQFIqk8+KQR/Sta43Lw85czVJlxjzAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0OBBYEFFdqnSDAvZJe8F6/4VbhECPNIZf/MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AuYm9zLWJyZW1lbi5kZS9wdWJsaWN3ZWIvc3RhdHVzL29jc3AwPAYDVR0RBDUwM4IVZGV2LmdvdmVybmlrdXMtZWlkLmRlghpkZXYtZGVtby5nb3Zlcm5pa3VzLWVpZC5kZTANBgkqhkiG9w0BAQsFAAOCAQEAMZaY6wFGQTrb7Ke2cST6ZJrUhs1H70awcWO5abMmFWipwqhaW95oUmZvMFxEZcehKgDej1ltHhwkvcCbhM97+pxNLJWnmwn8fpDn28xkkG1pcnKfz7Nj+Nn66NMFeSU4LCKjmfqhmiqaxk6JHOqHwoG8c2b6X5krVLhhhbTAW4oojmJUhrjeeglPpD60JneVRy1w8qoRaDd5UFaMgwRgi0Nom8qaIcYTZuJYhIRb5sTR2SAVjbpEMwZq3NqczOFTafB6HFsLiHB/6RSBtqAC9KMC9m4LPEQvAWN8+sTltYPio/IoTIUVrU13uzOmxTGmubQx2St/7IBy5m7dlk0WUQ==
-demw_tls_client_cert: MIIEBjCCAe6gAwIBAgIEW5qctzANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQnJlbWVuMQ8wDQYDVQQHDAZCcmVtZW4xFjAUBgNVBAoMDUdvdmVybmlrdXMgS0cxDDAKBgNVBAsMA0FBQTEdMBsGA1UEAwwUVExTIENsaWVudCBUZXN0IFJvb3QwHhcNMTgwOTEzMTcyMTU5WhcNMjgwOTEzMTcyMTU5WjAWMRQwEgYDVQQDDAtTRUVVTVdURVNUMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrIhhv3LAyliTVQJ+BLj2Kvx3dJnVaU2cmZl3H5bjtwco6vUKYjsa4IvQzPu+OWID9hi36JzFKQmHJf2kCg/AtSi0JLi3/LjpRJ2KmhEHSqk1ZBnQapfj5TVgSx9+LkROrfmBXH3IrqAQBxEKs6xjBRIdqy0R09PkvR62gTCvysp6LJ/+nDd8tdOB4ysQy+NLG+PDXrq6ikJuTPauAfGYTP25rvIWah/0FH7WcEQzEeILOk4Rb1gZFxwDs1Chgh46/bdGp756qyGJ5Vxnf+wBSUZb22NT1DyjmnUNN+hxa9rtcXSvSblZYWlDIFy19ikR2FZv+BjLmv5asbWqezo58CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAYNzmlPUIWUhG6Tg8aTq36HFYs1LrPHVifE9Ub7xwynQmyDcdduZQsHzEVoXdQn2nRR6Xu2yGSTgXEqwtqg23T1bx1kKkFoeMUwW6uvkwKnE1anWkKeCtjnxtb5akW4T2ZTB7wPGELpHCaRXd484A3Ftm/WpuCRjgbdaBVl9kuVGLu3bun8BIaUfEc3SDvEgA7BX1siYGJRQuXsSovJb1wSLJmFgzRXBvgONAYB1kTnRM8FsuHBID8OIQTWhDldexECyh/rXccsS1sOk9+G87u97Nu5s6wFRA9H0zNIMtqf7IKTRgdh+8D0CuDlJcILRBYczRq7tUXoEGasKhXtmpe3flQmo5aKDxncPb8VzbWD7Nn2lKxywddYKbLZ2SsdQZjsLrVUrJ2EMyJ/VWWGGj7AdNww4pbKEWn/lG9mAp+Ca8bCr1W6p2lI56Snc8MhFggUOWYJ/DaRaSt0PmpyUPu4CIMlBq9ZYi5Dtpkp5ey8yHkh1fRqlgdJnF1apCXB1LfstCwoxb/1CCy++O0Y5OM282/gI9+KWx8K7ysTjP/hNpp8DhLd4dVvcV9FhEbsxMDWL1ZC1EQgDHjnlNj2douzMDI9qZ5Igv7Ru2n9u3jl5yirPtfcTApUCzsT240cw3gwbPEDJQszoziCQ9BfoPtwqbQQDdi17MrO8hgKzE5Ik=
diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
deleted file mode 100755
index 80da2efe..00000000
--- a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-cat<<EOF
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CoreConfiguration xmlns="http:/www.bos_bremen.de/2009/06/eID-Server-CoreConfig">
-    <ServerUrl>https://${PUBLIC_HOSTNAME}/eidas-middleware</ServerUrl>
-    <sessionManagerUsesDatabase>true</sessionManagerUsesDatabase>
-    <sessionMaxPendingRequests>500</sessionMaxPendingRequests>
-    <certificateWarningMargin>200</certificateWarningMargin>
-    <TimerConfiguration>
-        <certRenewal length="2" unit="11"/>
-        <blacklistRenewal length="2" unit="11"/>
-        <masterAndDefectListRenewal length="2" unit="11"/>
-    </TimerConfiguration>
-    <ServiceProvider entityID="qa-se-de-middleware" enabled="true">
-        <EPAConnectorConfiguration updateCVC="true">
-            <CVCRefID>qa-se-de-middleware</CVCRefID>
-            <PkiConnectorConfiguration>
-                <blackListTrustAnchor>MIIEcTCCA1mgAwIBAgIIDI0LEBD/wRIwDQYJKoZIhvcNAQELBQAwVzEnMCUGA1UEAwweYm9zIENBIGVJRCBDb21tdW5pY2F0aW9uIENlcnRzMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJERTAeFw0xMzA1MDcwNzQ5MjRaFw0xNjA1MDYwNzQ5MjRaMGgxHjAcBgNVBAMMFWRldi5nb3Zlcm5pa3VzLWVpZC5kZTEYMBYGA1UECwwPdGVzdGNlcnRpZmljYXRlMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJkZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9ea6dQveXgc23F7jteqN9L023MpOI7BnqD4YxsrOMfEhHBj1tcr1VpZgxtamhHKEJEqptN5ObotyA/wKqeIBEzLgfLGqMyPqnSyejELRql1KYi+moCgMWNiU5FAfhd29Rgr8rPhPtBSgkO7DQdXzaTQxDxQssUTlK5AifIl/f0+/emGZUknAIfXxgXlNmuSCijAt1qoNkd+VS05unQFYKqb3BfxFQDgHqdmg0caPDvb5KHYuTMGFhmRe3B8lt5ffM+QaIK8q+qTy2rU/4jS331tauGdxDv/JniOV2z5gzut4H42Naek9SPjgotk0ON8B4ZuSZf23pJ9GqRH1v9u+MCAwEAAaOCAS4wggEqMAwGA1UdEwEB/wQCMAAwPwYDVR0lBDgwNgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDDDAfBgNVHSMEGDAWgBQFIqk8+KQR/Sta43Lw85czVJlxjzAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0OBBYEFFdqnSDAvZJe8F6/4VbhECPNIZf/MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AuYm9zLWJyZW1lbi5kZS9wdWJsaWN3ZWIvc3RhdHVzL29jc3AwPAYDVR0RBDUwM4IVZGV2LmdvdmVybmlrdXMtZWlkLmRlghpkZXYtZGVtby5nb3Zlcm5pa3VzLWVpZC5kZTANBgkqhkiG9w0BAQsFAAOCAQEAMZaY6wFGQTrb7Ke2cST6ZJrUhs1H70awcWO5abMmFWipwqhaW95oUmZvMFxEZcehKgDej1ltHhwkvcCbhM97+pxNLJWnmwn8fpDn28xkkG1pcnKfz7Nj+Nn66NMFeSU4LCKjmfqhmiqaxk6JHOqHwoG8c2b6X5krVLhhhbTAW4oojmJUhrjeeglPpD60JneVRy1w8qoRaDd5UFaMgwRgi0Nom8qaIcYTZuJYhIRb5sTR2SAVjbpEMwZq3NqczOFTafB6HFsLiHB/6RSBtqAC9KMC9m4LPEQvAWN8+sTltYPio/IoTIUVrU13uzOmxTGmubQx2St/7IBy5m7dlk0WUQ==</blackListTrustAnchor>
-                <masterListTrustAnchor>MIIELTCCA7SgAwIBAgIBBTAKBggqhkjOPQQDAzBVMQswCQYDVQQGEwJERTENMAsGA1UECgwEYnVuZDEMMAoGA1UECwwDYnNpMQ0wCwYDVQQFEwQwMDA0MRowGAYDVQQDDBFURVNUIGNzY2EtZ2VybWFueTAeFw0xNTA5MjMwODU2MzlaFw0yNjAzMjMyMzU5NTlaMGAxCzAJBgNVBAYTAkRFMQ0wCwYDVQQKDARidW5kMQwwCgYDVQQLDANic2kxDTALBgNVBAUTBDAwMDYxJTAjBgNVBAMMHFRFU1QgQ1NDQSBNYXN0ZXIgTGlzdCBTaWduZXIwggEzMIHsBgcqhkjOPQIBMIHgAgEBMCwGByqGSM49AQECIQCp+1fboe6pvD5mCpCdg41ybjv2I9UmICggE0gdH25TdzBEBCB9Wgl1/CwwV+72dTBBev/n+4BVwSbcXGzpSktE8zC12QQgJtxcbOlKS0TzMLXZu9d8v5WEFilc9+HOa8zcGP+MB7YEQQSL0q65y35XyyxLSC/8gbevud4n4eO9I8I6RFO9ms4yYlR++DXD2sT9l/hGGhRhHcnCd0UTLe2OVFwdVMcvBGmXAiEAqftX26Huqbw+ZgqQnYONcYw5eqO1Yab3kB4OgpdIVqcCAQEDQgAEitE7LDrEMzLs7tPp6pe6BzZJHaThJzm49mUw2x3gKS1iYIeNqXngL5E0sX7MDZZp13dikfbKVln+8k8IiNKrVKOCAYwwggGIMB8GA1UdIwQYMBaAFHD8PNdfzGkLdI7YpGbmsFvP3TmdMB0GA1UdDgQWBBRioyCrfGByzK9GY8va0e1lUoy8czAOBgNVHQ8BAf8EBAMCB4AwKwYDVR0QBCQwIoAPMjAxNTA5MjMwODU2MzlagQ8yMDE4MDkyMzIzNTk1OVowFgYDVR0gBA8wDTALBgkEAH8ABwMBAQEwUQYDVR0RBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDBRBgNVHRIESjBIgRhjc2NhLWdlcm1hbnlAYnNpLmJ1bmQuZGWGHGh0dHBzOi8vd3d3LmJzaS5idW5kLmRlL2NzY2GkDjAMMQowCAYDVQQHDAFEMBQGA1UdJQEB/wQKMAgGBmeBCAEBAzA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vd3d3LmJzaS5idW5kLmRlL3Rlc3RfY3NjYV9jcmwwCgYIKoZIzj0EAwMDZwAwZAIwI7b8uJ2wSKDA6YjzLtR9CyOQorXfilVJDVkYkk5zEmVbzA4vLLizjemfYZZQXY/YAjAf6xsMtIIIwJHch1J6Akm8cdjfR653xOx2cLgPCPLOXws3b4Auk2xtolq8YSzD1kA=</masterListTrustAnchor>
-                <defectListTrustAnchor>MIIELTCCA7SgAwIBAgIBBDAKBggqhkjOPQQDAzBVMQswCQYDVQQGEwJERTENMAsGA1UECgwEYnVuZDEMMAoGA1UECwwDYnNpMQ0wCwYDVQQFEwQwMDA0MRowGAYDVQQDDBFURVNUIGNzY2EtZ2VybWFueTAeFw0xNTA5MjMwODU1MjZaFw0yNjAzMjMyMzU5NTlaMGAxCzAJBgNVBAYTAkRFMQ0wCwYDVQQKDARidW5kMQwwCgYDVQQLDANic2kxDTALBgNVBAUTBDAwMDYxJTAjBgNVBAMMHFRFU1QgQ1NDQSBEZWZlY3QgTGlzdCBTaWduZXIwggEzMIHsBgcqhkjOPQIBMIHgAgEBMCwGByqGSM49AQECIQCp+1fboe6pvD5mCpCdg41ybjv2I9UmICggE0gdH25TdzBEBCB9Wgl1/CwwV+72dTBBev/n+4BVwSbcXGzpSktE8zC12QQgJtxcbOlKS0TzMLXZu9d8v5WEFilc9+HOa8zcGP+MB7YEQQSL0q65y35XyyxLSC/8gbevud4n4eO9I8I6RFO9ms4yYlR++DXD2sT9l/hGGhRhHcnCd0UTLe2OVFwdVMcvBGmXAiEAqftX26Huqbw+ZgqQnYONcYw5eqO1Yab3kB4OgpdIVqcCAQEDQgAEphPfzRAJDfLG1r0JpAJYgdRvKc0DacjGhbxhuEWlMRB1XpV3pKPpVHUuraDEaC4Ru8q2W4etyA4Swc8JQ6jdXaOCAYwwggGIMB8GA1UdIwQYMBaAFHD8PNdfzGkLdI7YpGbmsFvP3TmdMB0GA1UdDgQWBBSFeLqnCPkXciiQQOzwVzQDNiNWBDAOBgNVHQ8BAf8EBAMCB4AwKwYDVR0QBCQwIoAPMjAxNTA5MjMwODU1MjZagQ8yMDE4MDkyMzIzNTk1OVowFgYDVR0gBA8wDTALBgkEAH8ABwMBAQEwUQYDVR0RBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDBRBgNVHRIESjBIgRhjc2NhLWdlcm1hbnlAYnNpLmJ1bmQuZGWGHGh0dHBzOi8vd3d3LmJzaS5idW5kLmRlL2NzY2GkDjAMMQowCAYDVQQHDAFEMBQGA1UdJQEB/wQKMAgGBmeBCAEBAzA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vd3d3LmJzaS5idW5kLmRlL3Rlc3RfY3NjYV9jcmwwCgYIKoZIzj0EAwMDZwAwZAIwPAvVTvhJuX0dIyd7Ouv0t03J2KA08JehN+RA6oVU7xvS7RbCLIcKNYqVRnC4eJrOAjB1X89X1lH/0Fq3HH1tKXw3ELw62dBrHeHGsn3kcWNXxYqr5iRobwJru3FPk5ka34s=</defectListTrustAnchor>
-                <policyImplementationId>govDvca</policyImplementationId>
-                <sslKeys id="default">
-                    <serverCertificate>${DEMW_TLS_SERVER_CERT}</serverCertificate>
-                    <clientCertificate>${DEMW_TLS_CLIENT_CERT}</clientCertificate>
-                    <clientKey>${DEMW_TLS_CLIENT_KEY}</clientKey>
-                </sslKeys>
-                <terminalAuthService sslKeysId="default">
-                    <url>https://dev.governikus-eid.de:9444/gov_dvca/ta-service</url>
-                </terminalAuthService>
-                <restrictedIdService sslKeysId="default">
-                    <url>https://dev.governikus-eid.de:9444/gov_dvca/ri-service</url>
-                </restrictedIdService>
-                <passiveAuthService sslKeysId="default">
-                    <url>https://dev.governikus-eid.de:9444/gov_dvca/pa-service</url>
-                </passiveAuthService>
-                <dvcaCertDescriptionService sslKeysId="default">
-                    <url>https://dev.governikus-eid.de:9444/gov_dvca/certDesc-service</url>
-                </dvcaCertDescriptionService>
-            </PkiConnectorConfiguration>
-            <PaosReceiverURL>https://${PUBLIC_HOSTNAME}/eidas-middleware/paosreceiver</PaosReceiverURL>
-            <hoursRefreshCVCBeforeExpires>48</hoursRefreshCVCBeforeExpires>
-        </EPAConnectorConfiguration>
-    </ServiceProvider>
-</CoreConfiguration>
-EOF
diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
deleted file mode 100755
index 4f99ce4b..00000000
--- a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-cat<<EOF
-logging.file=
-poseidas.admin.hashed.password=${POSEIDAS_ADMIN_HASHED_PASSWORD}
-poseidas.admin.username=${POSEIDAS_ADMIN_USERNAME:-demw}
-server.port=${SERVER_PORT:-8443}
-server.ssl.key-password=dummy
-server.ssl.key-store=file\:/tmp/${CERTNAME}.p12
-server.ssl.key-store-password=dummy
-server.ssl.keyAlias=tls
-server.ssl.keyStoreType=PKCS12
-spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
-spring.datasource.url=jdbc\:h2\:file\:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY\=-1;DB_CLOSE_ON_EXIT\=FALSE
-spring.datasource.username=${SPRING_DATASOURCE_USERNAME:-demw}
-EOF
diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
deleted file mode 100755
index d9a19d1d..00000000
--- a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-cat<<EOF
-CONTACT_PERSON_COMPANY=Sweden Connect
-CONTACT_PERSON_EMAIL=operations@swedenconnect.se
-CONTACT_PERSON_GIVENNAME=Sweden Connect
-CONTACT_PERSON_SURNAME=Operations
-CONTACT_PERSON_TEL=+46105742100
-COUNTRYCODE=SE
-ENTITYID_INT=qa-se-de-middleware
-SERVER_URL=https://${PUBLIC_HOSTNAME}
-MIDDLEWARE_CRYPT_ALIAS=${MIDDLEWARE_CRYPT_ALIAS:-demw}
-MIDDLEWARE_CRYPT_KEY=/opt/eidas-middleware/configuration/eidasmw-crypto-keystore.jks
-MIDDLEWARE_CRYPT_PIN=${MIDDLEWARE_CRYPT_PIN}
-MIDDLEWARE_SIGN_ALIAS=${MIDDLEWARE_SIGN_ALIAS:-demw}
-MIDDLEWARE_SIGN_KEY=/opt/eidas-middleware/configuration/eidasmw-signature-keystore.jks
-MIDDLEWARE_SIGN_PIN=${MIDDLEWARE_SIGN_PIN}
-ORGANIZATION_DISPLAY_NAME=SwedenConnect
-ORGANIZATION_LANG=sv
-ORGANIZATION_NAME=Sweden Connect
-ORGANIZATION_URL=https\://swedenconnect.se
-SERVICE_PROVIDER_CONFIG_FOLDER=/opt/eidas-middleware/configuration/serviceprovider-metadata
-SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/opt/eidas-middleware/configuration/swedenconnect-signer.crt
-EOF
diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/metadata-signer-qa.crt b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/metadata-signer-qa.crt
deleted file mode 100644
index f7ead17f52c69448f4be81555fb5d1f84c2d379b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1318
zcmXqLVpTF|V&-DvWSDAQ{r9MXornQ18>d#AN85K^Mn-N{27_QjZUas>=1>+kVWwbL
zLv;gH5QmFLF1S23C9^m~!BsaiB{i=kGc7YYu_QA;Pr)fau_(n*+CUPdkeNp)&{4rR
zwInemu_RF;I5Ryjwa7qDoY&CY(8$oz(8$QZ$TUiv*9gP~VlbCBmNqddA$yLIm4Ug5
ziJ!rsiHVD;iHVWn#@UlgO^sF9jU)nVg0I({HC(B9RNm1#M19)bc{`nB_v~kF<LF)d
zwn4?lHR`s_yc4#nE4Mz0{WI5UqR~C=>xS+LL6x^NYIbc`S<Zbl?ERBot{b1`yw&l4
zY4>ru&d(wbOC>k;LsDwjcQ7n(oKsmOu)*x?!W*x68W#R8pEh%*JL9b+nZIp!zaQP(
zcU|!sN9A8;lZ@FCb4+gRkhi$lxIwmHQ-`Shwd+&-ubuqcUt+0xuuSdmq{qv)GW+;;
z7sVfRSa?l5TwW=+*tt&JEkh{rcT&ZakORCdrd!TNbg>ofkzO-JTu;aRX5m}D%;Xz3
z?0;<h^%n~zN;#O^Uf5=4dj9{-i`sEkdCnDc?;prsZ*g-Oi<QM49?pt;H;!vg$h-V1
zef8fqH|1)6K8c^^^|$r;SJ+?sykY9LTUTCdKJqyAJ2`%Gz0DC%RsXp2b2h83mA}k+
zqrvoZ^TM}Azqb6SG{3j5N$$<(S-$7au>Hu=I~)+o`D>-e%w;Ag;sjp(>SCVZ>~!Pl
z;uQ;aX$jgV?Do|8dSYV_vuj(0%U;nG!*9<;1Jw7Huta>3cydF_y6sE)y13K6rTVW`
z&H7rDbWFs2o-;EFUR-9p=IrXW^AA-Rr2A@I+L*b_uiaf(mA;03;lVBE{IvX{x$YL;
zJ)v>kSy(aR`i!4zGK>_&xjr$c?@993Jl6E+L+n*1W<~}^<P-u-{=gK%$dGsFoQ>S}
z578gBBJSCRs+AU;P+9(S!D^l6(kdof_n(V*y|})M*{fY`=@p}83aek7w=rO7j6bfW
zl`(HZ&&q9kUS5}7Q`N8SGb?@Zy}R2hf(~xq^;7L)d)i~Z37_@T=d8Q^U$Wxj<FId>
zoB0mC6Z7L}ZO!bGxNx?>ecAo3AxjoYRPWxu^TfRO0Rr9q$;MtMpFNpcBHXKG`-q_~
zcIHWgTh&!Ei#adq&zW%k*6Npg7&I78cJ{2_C$W8v%(D2imeL+a7fz|PyZLEzwXf%r
zhW|N*+gPu!@l^B4Jr#NChSa5lihfEDDm7-A9hb;6{Qgmhz3B1YQr|y3oNkkCR<@Rf
z8QUyx%<Q=)>Sxw_G^dm2$4spSdv)h}pS-!WeVew=ab=?or*8g}<^82463D|E_;ykI
zSAEu$sfS*3O&7graB%kG2^o2RWD@EOmz2KOvSb!HQ1&AJ{;awX+eHqgeqy_h29!?7
zw~D;Msh9PpZrSuJp+(mFwx*V``@LdF_gHtPC2{Lhm5pB_izH7ib^THkn{-0n=Yn5n
z-Rh&2;isqd%iIXEFmz*$;+oT?b1PQ;!)3M}(W^gy`hKsh`s$ikV)HCq#U=i8QA%&n
ztvN3J-@n?<I~LK<F)98$f0mf;PBrhgWy{VR=4-#v3q9<WwbN#Eq|nX#EDF!8+B=?k
Rr{{cm5|#B+^uJ6n0{{bjI2!-}

diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/serviceprovider-metadata/.placeholder b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/serviceprovider-metadata/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/swedenconnect-signer.crt b/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/swedenconnect-signer.crt
deleted file mode 100644
index 8466ecfe..00000000
--- a/demw-1.sveidas.se/overlay/opt/eidas-middleware/configuration/swedenconnect-signer.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3
-ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz
-aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw
-CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM
-DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0
-YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer
-La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ
-g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H
-U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei
-ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6
-hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+
-yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt
-EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv
-yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU
-Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2
-xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw
-Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW
-BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su
-8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td
-ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ
-3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO
-kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4
-aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP
-7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q
-r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp
-8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz
-SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE
-BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI
-OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf
-j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
------END CERTIFICATE-----

From b8cf04d71349282d9555b9dc11af9e7f7b629cde Mon Sep 17 00:00:00 2001
From: John Van de Meulebrouck Brendgard <john@sunet.se>
Date: Tue, 5 Mar 2019 19:01:00 +0100
Subject: [PATCH 7/9] Change to use git://gitops.sunet.se/eid-ops

---
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index cdc5ba0f..0ea94e23 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -48,6 +48,14 @@ class common {
       content => template('sunet/cloudimage/sunet-reinstall.erb'),
     }
   }
+
+  # change git repo from git.nordu.net to gitops.sunet.se
+  exec { 'git_repo_sunet':
+    cwd     => '/var/cache/cosmos/repo',
+    command => '/usr/bin/git remote set-url origin git://gitops.sunet.se/eid-ops git://git.nordu.net/eid-ops',
+    onlyif  => '/usr/bin/git remote get-url origin | grep -qi git.nordu.net/eid-ops',
+  }
+
 }
 
 class dhcp6_client {

From 88205b4393a83dc2b45e3641bfe9223392df5096 Mon Sep 17 00:00:00 2001
From: John Van de Meulebrouck Brendgard <john@sunet.se>
Date: Wed, 6 Mar 2019 17:42:45 +0100
Subject: [PATCH 8/9] Changed cosmos.conf to point to
 git://gitops.sunet.se/eid-ops

---
 cosmos.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cosmos.conf b/cosmos.conf
index 0806a609..0f349357 100644
--- a/cosmos.conf
+++ b/cosmos.conf
@@ -1,3 +1,3 @@
 tag="eid-ops"
 addhost_ssh_args="-o ProxyCommand 'ssh root@jmp.komreg.net -W %h:%p'"
-repo=git://git.nordu.net/eid-ops
+repo=git://gitops.sunet.se/eid-ops

From e166295205afd618f1c2170acbbc4c7608ea1f06 Mon Sep 17 00:00:00 2001
From: John Van de Meulebrouck Brendgard <john@sunet.se>
Date: Wed, 6 Mar 2019 17:50:21 +0100
Subject: [PATCH 9/9] Also change git://git.nordu.net/eid-ops.git ->
 git://gitops.sunet.se/eid-ops

---
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 0ea94e23..28388457 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -49,7 +49,13 @@ class common {
     }
   }
 
-  # change git repo from git.nordu.net to gitops.sunet.se
+  # change git repo from git.nordu.net to gitops.sunet.se (for .git)
+  exec { 'git_repo_sunet_dot_git':
+    cwd     => '/var/cache/cosmos/repo',
+    command => '/usr/bin/git remote set-url origin git://gitops.sunet.se/eid-ops git://git.nordu.net/eid-ops.git',
+    onlyif  => '/usr/bin/git remote get-url origin | grep -qi git.nordu.net/eid-ops.git',
+  }
+  # change git repo from git.nordu.net to gitops.sunet.se (without .git)
   exec { 'git_repo_sunet':
     cwd     => '/var/cache/cosmos/repo',
     command => '/usr/bin/git remote set-url origin git://gitops.sunet.se/eid-ops git://git.nordu.net/eid-ops',