Separated Skolfed Prod and Trialfidus-metadata-2023-11-09-v01

6 files changed, 73 insertions, 3 deletions

diff --git a/metadata/certs/skolfederation-3_1.crt b/metadata/certs/skolfederation-3_1.crt
new file mode 100644
index 0000000..6d33d53
--- /dev/null
+++ b/metadata/certs/skolfederation-3_1.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFnTCCA4WgAwIBAgIJAP5FnC1GKefSMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEt
+MCsGA1UECgwkU3RpZnRlbHNlbiBmb3IgSW50ZXJuZXRpbmZyYXN0cnVrdHVyMCAX
+DTE2MDUyMzEzNTUyMFoYDzIxMTYwNTIzMTM1NTIwWjBkMQswCQYDVQQGEwJTRTES
+MBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xLTArBgNVBAoM
+JFN0aWZ0ZWxzZW4gZm9yIEludGVybmV0aW5mcmFzdHJ1a3R1cjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAKydAR9OBT4OEXe8n+/BDGvZyECbHR60wiB7
+KVXH5xEcfprgUZBlic0aL1fhKG8cLB/KpybZ1HbJyJ4fX0uYP4U989fYiMDECn4q
+WvcnCuAZXOromnR14keLyVNBIgi8oiDuRG7em2+fqJiDRGkG5CB7SaV4N457Pdrl
+QrxpsBWItWIbe9FatoT/3q3qU/FEAA5+XD9ax8Ycq6qhTqanzy/YDyYi1btqyBCd
+7Mu7I2wCZ1Q9wlz1kjtUbh2KHM8ui845qrqUCNxYpsj7D5zBZaZ+9CMiKrO+mmWJ
+DeIQ9m2lEPHG/kKumbewKRkZU5Z//fLytcOL+kNQiwC1Qe67gstPWnE0ZgpAIsYd
+gLVr2MHnBJuEAcMOGs+oX8y9sxRwcMoMJ9gF4xd12dIGlhffQo94aV4mvTjwJbQ4
+/R7NGE2yf3FtsqwQlVHzMojqp6SFOFHGOrYpQlrxhADyC8U97ukjCjkR7FLjzYqz
+YhqO8FnQI16uwJg/YNVol/gkLvRg/TVbMpbFW/C+uCk9l2N8hsQljUpmxZFN+JyX
+g6vF4pQ1ablqi2Mj5XhQO458XJdqeLvDCgXfuqiZ3x6GU/TISRWKAwG1EPdd+RBo
+h2kVCQATuaTqOj76QVagBZR2IFNxItcer1ugATE/NUK098RiOkjrkz2h2OC+tpj2
+BNC1jcTnAgMBAAGjUDBOMB0GA1UdDgQWBBQ6DlMFBYLMNF1egakVOw3yL3BflTAf
+BgNVHSMEGDAWgBQ6DlMFBYLMNF1egakVOw3yL3BflTAMBgNVHRMEBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQB5KmzUoEhwrZmTTrYJid155cnfyF9KjVoLG5jayzQo
+4AhOEDt7ahQkSG4cqmDJSInXaX07uoukopgm2IsanWw70SU7/jPPs2Y4960VuG6w
+0a5paeEDNJ10l6NfvROXxUd3VONQbxHbcq7ny3G8y692g2gihrDZv0Vgf0ea+gkT
+3ZSZzPewFHg6OFjTVKdTPzBIAWf//5GM5SFMn6WYOm3wwDu6cDoIYnkDOaeuCsDT
+nvCmczpIit7W0Wb+EajE+Or40g2YlHUWmOqrJovtN9Gc7ZZ8VV0WDnV8xI+FESFL
+yErUik0j1sXVh1/dpx8XYQaVUPd4R5ZVxtVrS3gXxa0Xnkng9mspCJ0fXqL9PYmO
+QZPSCmAUk5I4y3xJCTJGqeyfU+/1bp9CRpFOARYLsKxEgVEQhI/YxwhncN/snhM1
+IwCXorpgeCHemZtSB62MnKiw3faAKhcYNmiZt8FvTScySd2j7T/53FFuXCT5osz4
+GKdvBDzFp5m6xVXBLMTYwmNBeYTGbCYIHxWu1qjDXF4o6zUXG0j7IoXh9w7OLomJ
+oUrX/mw3I8KEhpbfdvfk3Y0H1kBvzsO6HzOuBLVqsRTQIcUuXCJ5ZqCq5/JHJgPr
+gsHQ3BsZmwOftzjR0SaehDbxdeUozPgFSTEDTaO5XZtnaXQE1Scb7KbaeBjaECh1
+vg==
+-----END CERTIFICATE-----
diff --git a/metadata/certs/skolfederation-trial-3_1.crt b/metadata/certs/skolfederation-trial-3_1.crt
new file mode 100644
index 0000000..47fee04
--- /dev/null
+++ b/metadata/certs/skolfederation-trial-3_1.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFnTCCA4WgAwIBAgIJAJIjkgQRcgiiMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEt
+MCsGA1UECgwkU3RpZnRlbHNlbiBmb3IgSW50ZXJuZXRpbmZyYXN0cnVrdHVyMCAX
+DTE2MDUyMzEzMjc0N1oYDzIxMTYwNTIzMTMyNzQ3WjBkMQswCQYDVQQGEwJTRTES
+MBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xLTArBgNVBAoM
+JFN0aWZ0ZWxzZW4gZm9yIEludGVybmV0aW5mcmFzdHJ1a3R1cjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBALv2W31Glj8DzofLuvrRsLiT03R0sb0QP4Oi
+MCMp4YJOvPuJeMxnoLj0+I5VVx5XpREftZq53CUFLWMjIuu2dzuGdg91MYHFY4zz
+MSe3xckD4XsjlrU4+ovaMEcYCJjNLrBVJlDVs6tfTXbwPAIbBq+SAAeLUzF4CJhL
+MNm4hwCvuYRXcFaapZKpZnTtwQ+Py/J10b5Bc9aF6766LNFreG39foKDrF+4vFW8
+39wLn+lyvBjMbUfbr5jk1kww8gN2Kq08wGJBlQaQyKCEoETH9hv48LvQ1Fi2IJd6
+kISjwdhQbF24WFHGyXl4Qr7Sk/HunEOZMQrum8JyDZUeGExBmzZcCgkNarG8u1AY
+JrNar+6g/0vLqj71E7coSJ0ywXxJH2WsQ/2FR9pkd5Inikp+ss9oto7UjStbZYLL
+Guyg3zOde5uxDqRbd+lfKQyKrsf43mPSs3vdvKpIQYfu6bueMa/oIMtal4g5upii
+4j0LENYGROZZad/IOQPxT3wG+BThYE/0EjD7BImm66sr5W+VAQRT0nroRTvm7kJJ
+tW8R/I9VK5nDAmdIdaqHCAr/lmJfXXIi0JMttYwtbTmaGkRPkPp7JMVQ5NFmjL+F
+hSlqFRJbDvkE0rlQ2Hobspb4AouVkg1mt5VG4A24ptdPUCvmg0v6J1R1FL1VH6Oy
+/lMWt1TnAgMBAAGjUDBOMB0GA1UdDgQWBBTeV6UGmGF0di0Rr43/BZpAeX9geTAf
+BgNVHSMEGDAWgBTeV6UGmGF0di0Rr43/BZpAeX9geTAMBgNVHRMEBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQAEE3sMWLF3mZHPzPZ+RxAn8NHpkwYz2Sz8B+NVlCsP
+81f64CxxknB+RwQWBmyottK2lNayvjEsydGvV/Fe5g6hwEJYBWaKGom/1vUqUhuD
+/zKTgt1sD3Z3NtLYZepFNNeO8DNQJNFzsLMY9EG0ufc7GbFGaVIJa1ZEzcVb9zc1
++lpAKGcODTjQv+gn9FmqUI4IZj/UcCMCkNrVXes6Lzyt2oWPgVFUC0zTPChXE+6V
+K7bdKch8enXKOpUVn4zg7BpoXLpKpk2RXFBXf6KM+GnWpfYsAkZGJmkwJ52Ovd8f
+oE3K+QnyxGsyGhN1PX0Dh+0896seCS8VC2Dgs+7JPPXoz7jLYGxiTG9fKMTUZMpm
+dSBt+jsitsjV4/41U7wveFLSM9kms3bEoXf9kCJfEqysw3qU4Txyn9zv4uOmBzn8
+fdZLa+Vpp6DqpyukSQdPsIcUc38tJomqMgrx1vdoIkWJE8sabj1MSEQmI4hdOoub
+kespEI3hPrbNTlWQApIaXWFE/WZftM+48bG9nNDzrNT+oZHFkR0xAnLnHT7WiB+p
+zfAgxd8HSURLgfQNUDc9glOwpVyev7MZMUq32VYXdwcMMfeSCWXFQcmbGp/hvpLr
+x2DA4dplOP9iMnLxcFeR8zf6IKsUPrAMC1zGe5nwJ3kcZppKydY388CDOMlMrztR
+lw==
+-----END CERTIFICATE-----
diff --git a/metadata/fidus-prod.fd b/metadata/fidus-prod.fd
index e1d0b0e..bf7815f 100644
--- a/metadata/fidus-prod.fd
+++ b/metadata/fidus-prod.fd
@@ -11,8 +11,8 @@
     - break
 - when update:
     - load:
-        - /opt/metadata/swamid cleanup clean
         - /opt/metadata/skolfederation cleanup clean
+        - /opt/metadata/swamid 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/fidus-test.fd b/metadata/fidus-test.fd
index 5617b60..d30b8c6 100644
--- a/metadata/fidus-test.fd
+++ b/metadata/fidus-test.fd
@@ -12,9 +12,12 @@
 - when update:
     - load:
         - /opt/metadata/skolfederation-trial cleanup clean
+        - /opt/metadata/skolfederation cleanup clean
         - /opt/metadata/swamid cleanup clean
         - /opt/metadata/test-idp cleanup clean via local
         - /opt/metadata/test-sp cleanup clean via local
+        - /opt/metadata/production-idp cleanup clean via local
+        - /opt/metadata/production-sp cleanup clean via local
     - select
     - fork:
         - select as downstream:
diff --git a/metadata/skolfederation-trial/metadata.lst b/metadata/skolfederation-trial/metadata.lst
index 8c25675..98fd0cc 100644
--- a/metadata/skolfederation-trial/metadata.lst
+++ b/metadata/skolfederation-trial/metadata.lst
@@ -1 +1,2 @@
-https://md.swefed.se/skolfederation/idp.xml
+https://md.swefed.se/skolfederation/prod-idp.xml skolfederation-3_1.crt
+https://md.swefed.se/skolfederation/trial-idp.xml skolfederation-trial-3_1.crt
diff --git a/metadata/skolfederation/metadata.lst b/metadata/skolfederation/metadata.lst
index 8c25675..cc3fdde 100644
--- a/metadata/skolfederation/metadata.lst
+++ b/metadata/skolfederation/metadata.lst
@@ -1 +1 @@
-https://md.swefed.se/skolfederation/idp.xml
+https://md.swefed.se/skolfederation/prod-idp.xml skolfederation-3_1.crt