Move metadata ui_info to the correct place.

saxtouri · Nov 10, 2016 · fee8a96 · fee8a96
1 parent 7e77e0b
commit fee8a96
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/config/plugins/inacademia_persistent_backend.yaml b/config/plugins/inacademia_persistent_backend.yaml
@@ -11,21 +11,6 @@ config:
       - {contact_type: technical, given_name: InAcademia, sur_name: Administrative Support, email_address: admin@inacademia.org}
       - {contact_type: technical, given_name: InAcademia, sur_name: Technical Support, email_address: tech@inacademia.org}
 
-    ui_info:
-      display_name:
-        - {text: InAcademia.org - TEST, lang: en}
-      description:
-          - {text: 'The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance',
-            lang: en}
-      logo:
-        - {text: 'https://inacademia.org/static/logo.png', width: '120', height: '60', lang: en}
-      keywords:
-        - {text: [Affiliation, Validation, Eligibility], lang: en}
-      information_url:
-        - {text: 'https://inacademia.org/about', lang: en}
-      privacy_statement_url:
-        - {text: 'https://inacademia.org/about/privacy', lang: en}
-
     metadata:
       mdq: ['http://pyff:8080']
 
@@ -46,6 +31,20 @@ config:
           - edupersontargetedid
           - edupersonprincipalname
         name_id_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
+        ui_info:
+          display_name:
+            - {text: InAcademia.org - TEST, lang: en}
+          description:
+              - {text: 'The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance',
+                lang: en}
+          logo:
+            - {text: 'https://inacademia.org/static/logo.png', width: '120', height: '60', lang: en}
+          keywords:
+            - {text: [Affiliation, Validation, Eligibility], lang: en}
+          information_url:
+            - {text: 'https://inacademia.org/about', lang: en}
+          privacy_statement_url:
+            - {text: 'https://inacademia.org/about/privacy', lang: en}
     name_form: 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
   disco_srv: http://localhost:8080/role/idp.ds
   publish_metadata: <base_url>/<name>/metadata
diff --git a/config/plugins/inacademia_transient_backend.yaml b/config/plugins/inacademia_transient_backend.yaml
@@ -11,21 +11,6 @@ config:
       - {contact_type: technical, given_name: InAcademia, sur_name: Administrative Support, email_address: admin@inacademia.org}
       - {contact_type: technical, given_name: InAcademia, sur_name: Technical Support, email_address: tech@inacademia.org}
 
-    ui_info:
-      display_name:
-        - {text: InAcademia.org - TEST, lang: en}
-      description:
-          - {text: 'The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance',
-            lang: en}
-      logo:
-        - {text: 'https://inacademia.org/static/logo.png', width: '120', height: '60', lang: en}
-      keywords:
-        - {text: [Affiliation, Validation, Eligibility], lang: en}
-      information_url:
-        - {text: 'https://inacademia.org/about', lang: en}
-      privacy_statement_url:
-        - {text: 'https://inacademia.org/about/privacy', lang: en}
-
     metadata:
       mdq: ['http://pyff:8080']
 
@@ -44,5 +29,20 @@ config:
         optional_attributes:
           - schachomeorganization
         name_id_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
+
+        ui_info:
+          display_name:
+            - {text: InAcademia.org - TEST, lang: en}
+          description:
+              - {text: 'The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance',
+                lang: en}
+          logo:
+            - {text: 'https://inacademia.org/static/logo.png', width: '120', height: '60', lang: en}
+          keywords:
+            - {text: [Affiliation, Validation, Eligibility], lang: en}
+          information_url:
+            - {text: 'https://inacademia.org/about', lang: en}
+          privacy_statement_url:
+            - {text: 'https://inacademia.org/about/privacy', lang: en}
   disco_srv: http://localhost:8080/role/idp.ds
   publish_metadata: <base_url>/<name>/metadata