Start using the new virtual IdPs for Skolverketfidus-metadata-2024-02-08-v01

8 files changed, 34 insertions, 36 deletions

diff --git a/metadata/Makefile b/metadata/Makefile
index aac7033..9a7150e 100644
--- a/metadata/Makefile
+++ b/metadata/Makefile
@@ -1,7 +1,6 @@
 
 aggregate-prod:
-	scripts/aggregate.sh swamid
-	scripts/aggregate.sh skolfederation
+	scripts/aggregate.sh fidus-interfederations-prod
 
 aggregate-test:
 	scripts/aggregate.sh fidus-interfederations-test
diff --git a/metadata/certs/skolverket-huvudman-prod.crt b/metadata/certs/skolverket-huvudman-prod.crt
new file mode 100644
index 0000000..8de1143
--- /dev/null
+++ b/metadata/certs/skolverket-huvudman-prod.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBzCCAu+gAwIBAgIUE7ywvLY/balpfzEkadhq8nj+bmkwDQYJKoZIhvcNAQEL
+BQAwEzERMA8GA1UEAwwIbWV0YWRhdGEwHhcNMjQwMjA3MTIzMTM2WhcNMzQwMjA0
+MTIzMTM2WjATMREwDwYDVQQDDAhtZXRhZGF0YTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBALqLd3ButusI4d16Xv1EiDc6K7ImC8sc71PRbPABMsoBbFlC
+igXNGcWfennRkjRFJEdUHiaGQDrv6T5oQ5lKGLz07B4abmwL4qymLjZRP7IktdL2
+ax4KOsytNRJLwXQaxguUC8clgRu3PGmqdMDB902C+iSzGgDxQbhxWXHuE5unNopm
+4Ip/POI8n04xI7xQ5TfoXnfFLZZi82+MkyEzOo7TayprLqiAfTugsXSUacuNGR4Y
+vLXh6KyusfX1pMYek6zuOH7cJWGRXtG2AVEpQbVYTWqd+MqBAFr/w5ixIM3ayGNc
+xO6UXy+TbnAVxFqqW4AvH9kFata+2aKjlgwoCZFWhzg34o9o3weCgA0AafpKT48m
+5qRcG/lZ09X3YTGYfgSHKPHtf4+acVn5L9mTJ1zPnqXOtByuXiiAhp0WfqS5SeT3
+1Q9aAmvgRjprsGd+Xs3u1OlXARXu1Vi+etlg+lkrYEv6MB+p1P2Tt3nciQqHiJy5
+f7lrSeuz3QEtZccn7VLbBOA7xaDnzioSFf30S4CtfeA8mMo/XRmDaPrYkbh8OwVX
+7fcnn01+BUkCPaV/pDYHi2ahEJThfF/ENthGjhXR/3lhGViaOUtCOvS+vjbIzIvl
+aSJzkNUcOBZpErpIScZ/slrWlTNIi6mCBGBwxi1OjOH/4VxjyVye1VSuZ6KdAgMB
+AAGjUzBRMB0GA1UdDgQWBBQnO7DpxhjnsZdn1ta+hvPGRs4l2TAfBgNVHSMEGDAW
+gBQnO7DpxhjnsZdn1ta+hvPGRs4l2TAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4ICAQA0kjddPoo4aVImfZDlUMldFyFn9NGDYUkYCgTOMLmNZMKxb873
+Ngv1NI7vcoAyc23x8SMq3QFgx3lcWjZCkwGTCT0/0CrG1yXHuI9Y8a/p7B4wKiDh
+Qf7z0PhzvtK61o2V0ArwG/1YJqmUU+x6xAwdUyYONi+41hvVSZ19KuEg3hnUc3f8
+yvo+eRUmnuTcel4pozjg5Nm4apOkDCVOnn/cIYUWN3qsoobMzp4PxMrEsPCpr8YM
+TlycUOvEPz8AI3/MtC1rYKmMqhxvml34zt2vVVCBdeoVSgFO4n9u9E7hyQLGC8SV
+rbrycVU1zMubOaE2rh2bh8+ShhHXRNDwq0/0/pSnz14K8qDEC8JUnpl0HD7zxsEc
+SoAWoogQwypirKvCbqQLkgiMxvJa73QwxtKCC184WK1uTpHgcqzwmmfeYXxQhSfB
+Vd5ZgHuwLttcljRu8H3SSL0h2AXHKa7IYRhpv3blb7tPyCsoV5512qPiGUD9w5Al
+zHxLIT/g9hnL2YHnj88MzAQHZK0ilcfXtprn0KfEcLZ1n63a3nmjZsTjnGEix+yQ
+rWaJ3TqQVJTULfeDULUnRZBHFnXb8H+VazhGc3xToUyexvkmPA0nKg9Jl2fcgxc8
+kefXIbxknHbsIk+GfKcw+PW3fTWghUU3bdb8oDXjB7KYEItfArX+N6Odnw==
+-----END CERTIFICATE-----
diff --git a/metadata/certs/skolverket-idpproxy-prod.crt b/metadata/certs/skolverket-idpproxy-prod.crt
deleted file mode 100644
index 16ab64a..0000000
--- a/metadata/certs/skolverket-idpproxy-prod.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEsDCCApgCCQDgywsBkbeCBDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDDA9z
-YXRvc2FfbWV0YWRhdGEwHhcNMjMwMTE5MTUxNjUzWhcNMzMwMTE2MTUxNjUzWjAa
-MRgwFgYDVQQDDA9zYXRvc2FfbWV0YWRhdGEwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQC2hBBYAD2Leo12za0yhXJzf4HfWSO4iK9tssOhezeyBKteAsy2
-3elDqfJeI+v1ApBwTKf9qqHpAUmgRUGznqXRqehRQbHkdZS9NAQ/aPT+8Qws/gw9
-P601k8IcYW4OOMRinJO+zbKHqss9qDn+Eu1XF1Yb9yzMW8S1LYiHJyC3kZwGi4aQ
-dBHiUHqh1idQWdWSTMJ/NqP0qL8/nlGnHJLVVYBaQ+PA2ggOJ9FARDEVszjxSyTR
-V/7VX6YKogIg55rcpgChmjVtyRFcLPbHG2QLfsXGs8sl5weS5OFn4ujrVHSeDP/E
-xRqMjWY9VRr7n+VBvfItykDC6WS4cjrm19IsGJEWmsUsKbZPrXLb+XdUApYyftc3
-LQibXwjD3WPd+5YN9f9jNe/LCRoQGiXS4JPvFn0I2fsLxa7h6U31yAADvu+7oU4q
-flYpHD61hcDBZtYJ9xfJGAsSvAS1Fxv2Fi7UI/gjTC1zkrtSDxMp4j2CbyAHYDTR
-0CK40V5EOLbAXM80TYdlacBX/4Miq/FS8tk5stN9Dtke0xAVVC2siZVlYgj8IXPI
-Qc9degXgBVNq6+TgSkCaHm9iqH13zb6FUoCAL5Lwhlaes0zoA5Xswdxo6Zx8qaSB
-06h7mNXBVUnMua085iSiLZONkoANcxDUmQJaLopQiEGNUuc+oTPlKVKX0wIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4ICAQBB3HhFj6oO4BFb0pyCv2duzGl0dCXteMd+qZeJ
-PnnyMo5IQK1rB7G0OTo+zMTV/VH8CLeb9V2aPZmT8JNtfcWOR0Iux/cwqM9AyYdO
-GaW308oiMzfP5jAVEv/kBe8sjOcmF7us82Th+uGlVI9ZpyuSJIVBER9Tr9dSjaZo
-9MogwTFYtDU2ZC/6M3Cft2N31gt+n9vmTwh183WIu9z2fGjzlRZQ/hs3tV+KVAT2
-gUgHY15TNhZHfdFk22U6+tDbocc3AZ+meGfV/DspOSsEU72p7qhGA91MRzYRq5ak
-yk8n74z8T2tW1IDWGFO6CJ8ioI3ja8wJelUHaGXWfgJGDsWsoSLV446TBCTDYlFY
-3fueQVk3gcPCPqHu1R7lXjqCVhYkbXtev6VT/zSq+ahIdKW0BB/MCAEpravt6GVe
-rLGY3BfD6TT/3DnDvCco7sAmRAJpbQ04whrw47yiXOq4nI627r57oYYZQVhHCaXj
-VWBqmLFA7y2U0DueXEM9i2u0h2EmJOROs9EGsNC4CJRgJQYEau9LmrsGjW3cB/B4
-/MeJci24odOf3SrzUjurzfrSTNjH2gEeFCs7DNecdVvF6bRdKRZM/MdgmXv/RVKh
-ygSB+2wiBmMik4oUKr3EC8DWg5NGxZ3NYjsA5rhyEc77WUfkax6xJ9BOS6Izp35i
-zj5Fgw==
------END CERTIFICATE-----
diff --git a/metadata/fidus-interfederations-prod/metadata.lst b/metadata/fidus-interfederations-prod/metadata.lst
new file mode 100644
index 0000000..0767278
--- /dev/null
+++ b/metadata/fidus-interfederations-prod/metadata.lst
@@ -0,0 +1,3 @@
+https://mds.swamid.se/md/swamid-registered.xml swamid.crt
+https://md.swefed.se/skolfederation/prod-idp.xml skolfed-idps-tmp.crt
+https://idp-skolverket.eduid.se/skolverket/idps.xml skolverket-huvudman-prod.crt
diff --git a/metadata/fidus-prod.fd b/metadata/fidus-prod.fd
index dd15e4f..dd5a6dd 100644
--- a/metadata/fidus-prod.fd
+++ b/metadata/fidus-prod.fd
@@ -11,8 +11,7 @@
     - break
 - when update:
     - load:
-        - /opt/metadata/skolfederation cleanup clean
-        - /opt/metadata/swamid cleanup clean
+        - /opt/metadata/fidus-interfederations-test cleanup clean
         - /opt/metadata/test-sp cleanup clean via local
         - /opt/metadata/production-idp cleanup clean via local
         - /opt/metadata/production-sp cleanup clean via local
diff --git a/metadata/skolfederation-trial/metadata.lst b/metadata/skolfederation-trial/metadata.lst
deleted file mode 100644
index d105727..0000000
--- a/metadata/skolfederation-trial/metadata.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-https://md.swefed.se/skolfederation/prod-idp.xml
-https://md.swefed.se/skolfederation/trial-idp.xml
diff --git a/metadata/skolfederation/metadata.lst b/metadata/skolfederation/metadata.lst
deleted file mode 100644
index 2f9f0f7..0000000
--- a/metadata/skolfederation/metadata.lst
+++ /dev/null
@@ -1 +0,0 @@
-https://md.swefed.se/skolfederation/prod-idp.xml skolfed-idps-tmp.crt
diff --git a/metadata/swamid/metadata.lst b/metadata/swamid/metadata.lst
deleted file mode 100644
index 664d95a..0000000
--- a/metadata/swamid/metadata.lst
+++ /dev/null
@@ -1 +0,0 @@
-https://mds.swamid.se/md/swamid-registered.xml swamid.crt