From d308bf1bd0a482a6b1ee2f7321f27f1ec716ac97 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 14:26:10 +0100
Subject: [PATCH 01/15] natpub-test-2-komreg.net added

---
 natpub-test-2-komreg.net/README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 natpub-test-2-komreg.net/README

diff --git a/natpub-test-2-komreg.net/README b/natpub-test-2-komreg.net/README
new file mode 100644
index 00000000..a18dac1c
--- /dev/null
+++ b/natpub-test-2-komreg.net/README
@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

From 90d89eb4aa5f69cb64f0ad0d9429efc1415bb9d2 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 14:41:52 +0100
Subject: [PATCH 02/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 52374014..5fa590cd 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1201,6 +1201,15 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
+  natpub-test-2-komreg.net:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   nic.komreg.net:
     autoupdate: null
     common: null
@@ -1469,10 +1478,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1509,10 +1518,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1563,10 +1572,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
     fe-tug-3.komreg.net]
@@ -1588,10 +1597,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.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, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1623,10 +1632,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
     natpub-test-1-komreg.net, p1.komreg.net, p2.qa.komreg.net]
@@ -1658,10 +1667,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [web-1.qa.sveidas.se]
   pages: [web-1.qa.sveidas.se]
@@ -1709,8 +1718,8 @@ members:
     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,
     natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net, natpub-1.komreg.net,
-    natpub-2.komreg.net, natpub-test-1-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,
+    natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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, test-1.test.sveidas.se,
     validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
@@ -1732,10 +1741,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se,
     eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se,
@@ -1760,10 +1769,10 @@ members:
     log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se]
   test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se,

From 74afa6e804423c844551452d6bf3a4d13a3893a7 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 14:43:39 +0100
Subject: [PATCH 03/15] Add entry for new natpub-machine.

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

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 44683961..d1fe1f65 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -564,6 +564,19 @@ natpub-test-1-komreg.net:
             - 'fe-tug-1.test.komreg.net'
          port: '443'
 
+natpub-test-2-komreg.net:
+   autoupdate:
+   md_publisher:
+     keyname: natpub.test.komreg.net_infra
+   mdsl_publisher:
+   sunet::frontend::register_sites:
+     sites:
+       'test.md.eidas.swedenconnect.se':
+         frontends:
+            - 'fe-fre-1.test.komreg.net'
+            - 'fe-tug-1.test.komreg.net'
+         port: '443'
+
 validator-1-test.komreg.net:
    eid::dockerhost:
       version: '5:20.10.6~3-0~ubuntu-focal'

From 55eb3d9fe06daf99bc4d3956670f5641efddc1de Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 14:44:10 +0100
Subject: [PATCH 04/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 5fa590cd..7447b154 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1202,11 +1202,19 @@ classes:
     sunet::server: *id002
     sunetops: null
   natpub-test-2-komreg.net:
+    autoupdate: null
     common: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
+    md_publisher: {keyname: natpub.test.komreg.net_infra}
+    mdsl_publisher: null
     nrpe: null
+    sunet::frontend::register_sites:
+      sites:
+        test.md.eidas.swedenconnect.se:
+          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
+          port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1497,8 +1505,8 @@ members:
     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, natmd-test-1.komreg.net,
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-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,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   common: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1638,14 +1646,14 @@ members:
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
-    natpub-test-1-komreg.net, p1.komreg.net, p2.qa.komreg.net]
+    natpub-test-1-komreg.net, natpub-test-2-komreg.net, p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-test-1-komreg.net,
-    p2.qa.komreg.net]
+    natpub-test-2-komreg.net, p2.qa.komreg.net]
   metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
     jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net,
     natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
@@ -1695,9 +1703,9 @@ members:
     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, eidastest-1.qa.sveidas.se, eupub-1.komreg.net,
     eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    natpub-test-2-komreg.net, p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se,
+    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net,
+    validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet::fticks: [log.qa.sveidas.se]
   sunet::nagiosapi: [nic.komreg.net]
   sunet::rsyslog: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,

From 6b27126c6ae76558651f742bfedd20d19aeee941 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:10:13 +0100
Subject: [PATCH 05/15] eupub-test-2.komreg.net added

---
 eupub-test-2.komreg.net/README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 eupub-test-2.komreg.net/README

diff --git a/eupub-test-2.komreg.net/README b/eupub-test-2.komreg.net/README
new file mode 100644
index 00000000..a18dac1c
--- /dev/null
+++ b/eupub-test-2.komreg.net/README
@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

From b4658db81a687d77e00438fffc6eb0eb393631c3 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:12:48 +0100
Subject: [PATCH 06/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 7447b154..448f1dc9 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -494,6 +494,15 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
+  eupub-test-2.komreg.net:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   fe-fre-1.test.komreg.net:
     common: null
     eid::dockerhost: &id020 {version: '5:20.10.12~3-0~ubuntu-focal'}
@@ -1478,17 +1487,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1518,17 +1527,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1572,17 +1581,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
@@ -1597,17 +1606,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
@@ -1632,17 +1641,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
@@ -1667,17 +1676,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [web-1.qa.sveidas.se]
@@ -1717,19 +1726,19 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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-1.test.sveidas.se, log-1.test.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,
-    natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net, natpub-1.komreg.net,
-    natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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, test-1.test.sveidas.se,
-    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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-1.test.sveidas.se, log-1.test.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, natmd-2.komreg.net, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
+    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet::server: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1740,10 +1749,10 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jmp.komreg.net,
-    jump-fre-3.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
+    jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net, jump-tug-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.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1769,17 +1778,17 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se]

From aa8c74ac8e662f51ab47641039d4b662a33f639e Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:17:08 +0100
Subject: [PATCH 07/15] Add entries for eupub-test.

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

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index d1fe1f65..e673d062 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -596,6 +596,18 @@ eupub-1.komreg.net:
             - 'fe-tug-3.komreg.net'
          port: '443'
 
+eupub-test-1.komreg.net:
+   autoupdate:
+   md_publisher:
+     keyname: eupub-test.komreg.net_infra
+   mdsl_publisher:
+
+eupub-test-2.komreg.net:
+   autoupdate:
+   md_publisher:
+     keyname: eupub-test.komreg.net_infra
+   mdsl_publisher:
+
 natmd-2.komreg.net:
    autoupdate:
    eid::dockerhost:

From 21424a794a477002edd55ec47fbee16304b96631 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:17:34 +0100
Subject: [PATCH 08/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 448f1dc9..3e995c70 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -495,10 +495,13 @@ classes:
     sunet::server: *id002
     sunetops: null
   eupub-test-2.komreg.net:
+    autoupdate: null
     common: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
+    md_publisher: {keyname: eupub-test.komreg.net_infra}
+    mdsl_publisher: null
     nrpe: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1509,9 +1512,9 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.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-1.test.sveidas.se, log-2.sveidas.se,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net,
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
     natpub-test-2-komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
@@ -1654,15 +1657,16 @@ members:
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
-  md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
-    natpub-test-1-komreg.net, natpub-test-2-komreg.net, p1.komreg.net, p2.qa.komreg.net]
+  md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-2-komreg.net,
+    p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
-  mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-2-komreg.net, p2.qa.komreg.net]
+  mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net,
+    natpub-test-1-komreg.net, natpub-test-2-komreg.net, p2.qa.komreg.net]
   metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
     jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net,
     natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]

From a32133777c774200fb97ce0ec7cadf831e9f6697 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:34:59 +0100
Subject: [PATCH 09/15] eupub-test-1.komreg.net added

---
 eupub-test-1.komreg.net/README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 eupub-test-1.komreg.net/README

diff --git a/eupub-test-1.komreg.net/README b/eupub-test-1.komreg.net/README
new file mode 100644
index 00000000..a18dac1c
--- /dev/null
+++ b/eupub-test-1.komreg.net/README
@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

From 701974766570a288a379ca3fd46db5ad49576e89 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 15:37:51 +0100
Subject: [PATCH 10/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 3e995c70..54b5d481 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -494,6 +494,18 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
+  eupub-test-1.komreg.net:
+    autoupdate: null
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    md_publisher: {keyname: eupub-test.komreg.net_infra}
+    mdsl_publisher: null
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   eupub-test-2.komreg.net:
     autoupdate: null
     common: null
@@ -1490,11 +1502,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1512,14 +1524,15 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, jmp.komreg.net,
-    jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, log-1.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
-    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se,
+    log-1.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net, natpub-1.komreg.net,
+    natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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, test-1.test.sveidas.se,
+    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   common: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1530,11 +1543,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1584,11 +1597,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1609,11 +1622,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1644,11 +1657,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1657,16 +1670,16 @@ members:
     prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
-  md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-2-komreg.net,
-    p1.komreg.net, p2.qa.komreg.net]
+  md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-2-komreg.net, p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
-  mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net,
-    natpub-test-1-komreg.net, natpub-test-2-komreg.net, p2.qa.komreg.net]
+  mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, natpub-test-1-komreg.net, natpub-test-2-komreg.net, p2.qa.komreg.net]
   metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
     jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net,
     natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
@@ -1680,11 +1693,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
@@ -1730,11 +1743,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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-1.test.sveidas.se, log-1.test.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,
@@ -1753,18 +1766,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net, jump-tug-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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
-    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net,
+    jmp.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-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.test.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, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
+    natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1782,11 +1795,11 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.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,
+    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,

From 9123ee5df800e20ae762d6ac191ca7fdd321286e Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 16:15:06 +0100
Subject: [PATCH 11/15] Add SSH-key for metadata machines.

---
 natpub-test-2-komreg.net/overlay/etc/hiera/data/local.yaml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 natpub-test-2-komreg.net/overlay/etc/hiera/data/local.yaml

diff --git a/natpub-test-2-komreg.net/overlay/etc/hiera/data/local.yaml b/natpub-test-2-komreg.net/overlay/etc/hiera/data/local.yaml
new file mode 100644
index 00000000..335f5ff7
--- /dev/null
+++ b/natpub-test-2-komreg.net/overlay/etc/hiera/data/local.yaml
@@ -0,0 +1,2 @@
+publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAINY+lngI6IMvfSMy3tptmQDlmy+VlduWiA8eRzcZYLlm
+publisher_ssh_key_type: ssh-ed25519

From e45b6bc638b218e0c39e8c7adbc91b7932164b87 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 16:17:43 +0100
Subject: [PATCH 12/15] Add SSH-keys for metadata

---
 eupub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml | 2 ++
 eupub-test-2.komreg.net/overlay/etc/hiera/data/local.yaml | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 eupub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
 create mode 100644 eupub-test-2.komreg.net/overlay/etc/hiera/data/local.yaml

diff --git a/eupub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml b/eupub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
new file mode 100644
index 00000000..335f5ff7
--- /dev/null
+++ b/eupub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
@@ -0,0 +1,2 @@
+publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAINY+lngI6IMvfSMy3tptmQDlmy+VlduWiA8eRzcZYLlm
+publisher_ssh_key_type: ssh-ed25519
diff --git a/eupub-test-2.komreg.net/overlay/etc/hiera/data/local.yaml b/eupub-test-2.komreg.net/overlay/etc/hiera/data/local.yaml
new file mode 100644
index 00000000..335f5ff7
--- /dev/null
+++ b/eupub-test-2.komreg.net/overlay/etc/hiera/data/local.yaml
@@ -0,0 +1,2 @@
+publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAINY+lngI6IMvfSMy3tptmQDlmy+VlduWiA8eRzcZYLlm
+publisher_ssh_key_type: ssh-ed25519

From 5f9dabf68ba0542a45c16f923aea4a7ae54bb2d2 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 16:21:22 +0100
Subject: [PATCH 13/15] add Secret key for metadata.

---
 .../overlay/etc/hiera/data/local.eyaml        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 eumd-test-1.komreg.net/overlay/etc/hiera/data/local.eyaml

diff --git a/eumd-test-1.komreg.net/overlay/etc/hiera/data/local.eyaml b/eumd-test-1.komreg.net/overlay/etc/hiera/data/local.eyaml
new file mode 100644
index 00000000..839bcedb
--- /dev/null
+++ b/eumd-test-1.komreg.net/overlay/etc/hiera/data/local.eyaml
@@ -0,0 +1,29 @@
+
+
+pkcs11pin: ENC[PKCS7,MIIC2gYJKoZIhvcNAQcDoIICyzCCAscCAQAxggKCMIICfgIBADBmME4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAdBgNVBAMMFmV1bWQtdGVzdC0xLmtvbXJlZy5uZXQCFH9MhVHxArUyasvEzMPzj7yYfYpPMA0GCSqGSIb3DQEBAQUABIICAFXahe+Wttv1xx6oECMcFBq2Pkyh5AIfyGggAJ2Q3xI9IRXNpSk/LPKJDtabc2L4uj245CT+gZZrBW5VMIdQnVUB6cTwZKL4stE97k/f3R4YwsH1YOXiZXckFp3MaY4gSnRTjJKJgssvQO0Jcy7qodmS5WfzeArr/RvvZsFatoFL5CVecs9ZWZqO1RkzrWT6cWjbX9bO1U9vjdjwYOVQuFOIybaSzlwrkVnfHrHVst+VQsFXNhNQMapQoy26Sell3WGJD+UJsrC/wLTsd6DkzND8oVS8XxKp5/eAhO188rzGlYPFO7cd2cGy0aEpOn7Cp4LU7S/tv4YO59/uoiYSpxmXq0fDeyCHPuKDI7sMa40vg5qTcvyNAOncQJTcwr7Cgfb2RGBFR7mxImIa4fh6eF1cO4c3tEtccx3hnt/tymSwvzdCPyjmD8LvczFO/ne/Nlk5dkh7y3XMePuSmkYOly14XQLb9sFvQnbl5EV163G0GZxmkbkzDVBPx0dd1QB0cHpzadeHHhm4z1H5Glt8O/5c9eis1WqhuDtHtHaIfl68FPxzO0mBH5ZwlMvu2JuDwdhzSpC52m8PtnD2xkwM25AQivv7fOT8nC1hRoD14vtcLoqVye9z9YY61y1+dZSiw4uhXTWD+AC7bK3it3nrWJIQ+Q/0SzOqcCEEU5eXWdpYMDwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEAzPTN7cEbhwqB79etjLvJyAEM5rhu/zJb6KmCcAay2OOik=]
+publisher_ssh_privkey: >
+   ENC[PKCS7,MIIEXgYJKoZIhvcNAQcDoIIETzCCBEsCAQAxggKCMIICfgIBADBmME4xCzAJ
+   BgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAd
+   BgNVBAMMFmV1bWQtdGVzdC0xLmtvbXJlZy5uZXQCFH9MhVHxArUyasvEzMPz
+   j7yYfYpPMA0GCSqGSIb3DQEBAQUABIICAEIWXbx60EkLJXVwPIHhnq4/em1g
+   enpEQ73qkEliAZkPfIJqiwy4SeZZLwYhnNwhniws/MWooQJqZ800kNqX62cC
+   pNf4pwxB35lMKDyUZAMcM8nvW9e1DhHRigzO8dZd75Yct0C7NwuvzVtdNp0B
+   iHKI5cEBaXNxAMBN4G44Ju1L8VBACzogSuykBnRJCT1m/UFaFEo3brG/Pwcu
+   flg/MBGenN2Rrp/dCBvhNStacK5QM4aNGw3YfbP40Z0mmkmWuaJlaEqLI719
+   +YIJRjtqPZHOf15nzPEAPquuwMtFJllpupPl8F07MM0JC+5k7L/ZcrZi59xN
+   kKnGgjfn7/8B45L/e7nUHj8QOYPV2tTIxYIZClTztfqu/ntlzsWrqF9cU3PK
+   uF9Ih2cN7vAzbZiNc6Ben+fJkaEJ7pyLWNy7LYtxFnit1UAmDpKEvHIQweBT
+   IovVXdF0lYhCrpZuHU/QxM4TFlRywEEebjJc5497SjUTrkI4uKt2YRBXfp2U
+   RtJ3Pi4deLeeIhDHgbOuRUHDPv/1iMSMPQUVfrzbcBvHRyFam71Z2o/GlZES
+   t03Bt/HDwLrcvrFkKhFcKlze4E2lus59BSUXrjLGWw4GPxLrg5IG+WnU/0Yy
+   WEdrTAiAXIhuGXn20nkXbWD6wA9MC29EWsPBvNWN/c8EvptEW3WP0TswMIIB
+   vgYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQ8ylPa/5ovu23qmpFavIp5ICC
+   AZB5TpNjsrapsJdBCw1EZGheI0hlQFq2SRgfHz7KG5pchsZ/LzhRCfoXp4LV
+   dGU9Dk87vhF0YgRs+5unFJdPhEjUkfjqpR8c7wGzEtvuXccEJr2Sz2q3WEDB
+   696igoEtotyVUsYHPsWHpz+WrHe60U7oTISXaYVxjhF2LwEa20ml9gX1dCfM
+   w3EJZznqxGswWDbBXD/iZdfHQe3o2VMVN/Y+6agNq1eJIwafkvd8dl2EIXd7
+   mEQOs3MySCInPBPkuUY30iuThYW+V/y/t/Pi8x9kklzz0XyWFFqNyVsluh0v
+   +/b+FqVkL4IqIh7sfZmWClCCwBXc+HI0qmTuaWKgVi6GIsT+HU1EjJPDjcxV
+   HajtFS0SXZg+jBT3YJXdsjioww58xYDUPk4SyJcKwD3YwLyW7+q6bnQRlSn5
+   8Z6aVrleqGWA9ieNNLCEv/jBzOFOKGQlWzqHH6AOwAEsKXdMx8r1yTajY5Cq
+   KZOUXQjcpmBZ0EIG0f1/3wf6kQqivWfFkoFX5FhYIyHyiTzjjPKzHNPy]

From 79c947894fb8823d0779be5f6f94b3ba13a012d4 Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 17:18:37 +0100
Subject: [PATCH 14/15] eumd-test-2.komreg.net added

---
 eumd-test-2.komreg.net/README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 eumd-test-2.komreg.net/README

diff --git a/eumd-test-2.komreg.net/README b/eumd-test-2.komreg.net/README
new file mode 100644
index 00000000..a18dac1c
--- /dev/null
+++ b/eumd-test-2.komreg.net/README
@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

From 95a5c16ae618ec4405b9cfc0542bb1174585a07e Mon Sep 17 00:00:00 2001
From: Fredrik Kjellman <kjellman@sunet.se>
Date: Mon, 28 Feb 2022 17:21:36 +0100
Subject: [PATCH 15/15] update db

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

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 54b5d481..d2e11939 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -460,6 +460,15 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
+  eumd-test-2.komreg.net:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   eupub-1.komreg.net:
     autoupdate: null
     common: null
@@ -1502,17 +1511,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1543,17 +1553,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1597,17 +1608,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
@@ -1622,17 +1634,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
@@ -1657,17 +1670,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
@@ -1693,17 +1707,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [web-1.qa.sveidas.se]
@@ -1743,19 +1758,20 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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-1.test.sveidas.se, log-1.test.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, natmd-2.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
-    test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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-1.test.sveidas.se, log-1.test.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,
+    natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net, natpub-1.komreg.net,
+    natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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, test-1.test.sveidas.se,
+    validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet::server: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1766,9 +1782,9 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
+    fe-tug-3.komreg.net, jmp.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net,
     jump-tug-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,
@@ -1795,17 +1811,18 @@ members:
     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,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.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.test.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, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, natpub-test-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,
     test-1.test.sveidas.se, validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se]