Run both signers with the same pyff configrationmd-2023-05-15-v04

2 files changed, 50 insertions, 79 deletions

diff --git a/metadata/swamid-prod-ng.fd b/metadata/swamid-prod-ng.fd
deleted file mode 100644
index f09f9b54..00000000
--- a/metadata/swamid-prod-ng.fd
+++ /dev/null
@@ -1,76 +0,0 @@
-- when clean:
-    - xslt:
-       stylesheet: tidy.xsl
-    - check_xml_namespaces
-    - break
-- when update:
-    - load:
-        - /opt/metadata/swamid-edugain as swamid-edugain-dir cleanup clean
-        - /opt/metadata/swamid-2.0 as swamid-2.0-dir cleanup clean
-        - /opt/metadata/swamid-interfederations-2.0 as swamid-interfederations-dir cleanup clean
-        - /opt/metadata/swamid-testing as swamid-testing-dir cleanup clean
-
-    # Read dirs
-    - fork:
-        # swamid-2.0.xml
-        - select as swamid-2.0:
-            - swamid-edugain-dir
-            - swamid-2.0-dir
-            - swamid-interfederations-dir
-    - fork:
-        # swamid-edugain-1.0.xml
-        - select as swamid-edugain-1.0:
-            - swamid-edugain-dir
-    - fork:
-        # swamid-registered.xml swamid-discovery.xml
-        - select as swamid-registered:
-            - swamid-edugain-dir
-            - swamid-2.0-dir
-    # Read selectors
-    - fork:
-        # swamid-idp.xml
-        - select as swamid-idp:
-            - swamid-registered!//md:EntityDescriptor[md:IDPSSODescriptor]
-    - fork:
-        # swamid-idp-transitive.xml
-        - select as swamid-idp-transitive:
-            - swamid-2.0!//md:EntityDescriptor[md:IDPSSODescriptor]
-    - fork:
-        # swamid-sp.xml
-        - select as swamid-sp:
-            - swamid-registered!//md:EntityDescriptor[md:SPSSODescriptor]
-    - fork:
-        # swamid-sp-transitive.xml
-        - select as swamid-sp-transitive:
-            - swamid-2.0!//md:EntityDescriptor[md:SPSSODescriptor]
-
-    # Testing
-    - fork:
-        # swamid-testing-1.0.xml
-        - select as swamid-testing-1.0:
-            - swamid-edugain-dir
-            - swamid-2.0-dir
-            - swamid-testing-dir
-    - fork:
-        # swamid-testing-idp-1.0.xml
-        - select as swamid-testing-idp-1.0:
-            - swamid-testning-1.0!//md:EntityDescriptor[md:IDPSSODescriptor]
-    - break
-- when request:
-    - select
-    - pipe:
-        - when accept application/samlmetadata+xml application/xml:
-             - xslt:
-                 stylesheet: tidy.xsl
-             - pubinfo:
-                 publisher: https://mds.swamid.se/
-             - first
-             - finalize:
-                 baseURL: https://mds.swamid.se/
-                 cacheDuration: PT5H
-                 validUntil: P10D
-             - sign:
-                 key: http://pyff_luna_1:8000/swamidHA/swamid2
-                 cert: /etc/credentials/md-signer2.crt
-             - emit application/xml
-             - break
diff --git a/metadata/swamid-prod.fd b/metadata/swamid-prod.fd
index b37ce86a..f09f9b54 100644
--- a/metadata/swamid-prod.fd
+++ b/metadata/swamid-prod.fd
@@ -5,9 +5,56 @@
     - break
 - when update:
     - load:
-        - /opt/metadata/swamid-edugain cleanup clean
-        - /opt/metadata/swamid-2.0 cleanup clean
-        - /opt/metadata/swamid-interfederations-2.0 cleanup clean
+        - /opt/metadata/swamid-edugain as swamid-edugain-dir cleanup clean
+        - /opt/metadata/swamid-2.0 as swamid-2.0-dir cleanup clean
+        - /opt/metadata/swamid-interfederations-2.0 as swamid-interfederations-dir cleanup clean
+        - /opt/metadata/swamid-testing as swamid-testing-dir cleanup clean
+
+    # Read dirs
+    - fork:
+        # swamid-2.0.xml
+        - select as swamid-2.0:
+            - swamid-edugain-dir
+            - swamid-2.0-dir
+            - swamid-interfederations-dir
+    - fork:
+        # swamid-edugain-1.0.xml
+        - select as swamid-edugain-1.0:
+            - swamid-edugain-dir
+    - fork:
+        # swamid-registered.xml swamid-discovery.xml
+        - select as swamid-registered:
+            - swamid-edugain-dir
+            - swamid-2.0-dir
+    # Read selectors
+    - fork:
+        # swamid-idp.xml
+        - select as swamid-idp:
+            - swamid-registered!//md:EntityDescriptor[md:IDPSSODescriptor]
+    - fork:
+        # swamid-idp-transitive.xml
+        - select as swamid-idp-transitive:
+            - swamid-2.0!//md:EntityDescriptor[md:IDPSSODescriptor]
+    - fork:
+        # swamid-sp.xml
+        - select as swamid-sp:
+            - swamid-registered!//md:EntityDescriptor[md:SPSSODescriptor]
+    - fork:
+        # swamid-sp-transitive.xml
+        - select as swamid-sp-transitive:
+            - swamid-2.0!//md:EntityDescriptor[md:SPSSODescriptor]
+
+    # Testing
+    - fork:
+        # swamid-testing-1.0.xml
+        - select as swamid-testing-1.0:
+            - swamid-edugain-dir
+            - swamid-2.0-dir
+            - swamid-testing-dir
+    - fork:
+        # swamid-testing-idp-1.0.xml
+        - select as swamid-testing-idp-1.0:
+            - swamid-testning-1.0!//md:EntityDescriptor[md:IDPSSODescriptor]
     - break
 - when request:
     - select