fixed a few mistakes plus did reorder

global/overlay/etc/puppet/cosmos-rules.yaml

@@ -510,19 +510,6 @@ natmd-test-1.komreg.net:
       version: 1.1.5-eidas
    md_repo_client:
 
-natmd-test-2.komreg.net:
-   autoupdate:
-   eid::dockerhost:
-      version: '5:20.10.6~3-0~ubuntu-focal'
-   metadatamgrs:
-   konsulter:
-   eidas_hsm_client:
-   md_signer:
-      name: natmd-test
-      dest_host: natpub-test-2-komreg.net
-      version: 1.1.5-eidas
-   md_repo_client:
-
 eumd-1.komreg.net:
    autoupdate:
    eid::dockerhost:
@@ -538,6 +525,10 @@ eumd-1.komreg.net:
 
 eumd-test-1.komreg.net:
    autoupdate:
+   eid::dockerhost:
+      version: '5:20.10.6~3-0~ubuntu-focal'
+   metadatamgrs:
+   konsulter:
 
 natpub-1.komreg.net:
    autoupdate:
@@ -554,35 +545,16 @@ natpub-1.komreg.net:
 natpub-test-1-komreg.net:
    autoupdate:
    md_publisher:
-     keyname: natpub.test.komreg.net_infra
+     keyname: natpub-test-1.komreg.net_infra
    mdsl_publisher:
    sunet::frontend::register_sites:
      sites:
-       'test.md.eidas.swedenconnect.se':
+       'test.md.swedenconnect.se':
          frontends:
             - 'fe-fre-1.test.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'
-   konsulter:
-   autoupdate:
-
 eupub-1.komreg.net:
    autoupdate:
    md_publisher:
@@ -599,13 +571,7 @@ eupub-1.komreg.net:
 eupub-test-1.komreg.net:
    autoupdate:
    md_publisher:
-     keyname: eupub-test.komreg.net_infra
+     keyname: eupub-test-1.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:
@@ -621,6 +587,19 @@ natmd-2.komreg.net:
       version: 1.1.5-eidas
    md_repo_client:
 
+natmd-test-2.komreg.net:
+   autoupdate:
+   eid::dockerhost:
+      version: '5:20.10.6~3-0~ubuntu-focal'
+   metadatamgrs:
+   konsulter:
+   eidas_hsm_client:
+   md_signer:
+      name: natmd-test
+      dest_host: natpub-test-2-komreg.net
+      version: 1.1.5-eidas
+   md_repo_client:
+
 eumd-2.komreg.net:
    autoupdate:
    eid::dockerhost:
@@ -634,6 +613,13 @@ eumd-2.komreg.net:
       version: 1.1.5-eidas
    md_repo_client:
 
+eumd-test-2.komreg.net:
+   autoupdate:
+   eid::dockerhost:
+      version: '5:20.10.6~3-0~ubuntu-focal'
+   metadatamgrs:
+   konsulter:
+
 natpub-2.komreg.net:
    autoupdate:
    md_publisher:
@@ -646,6 +632,19 @@ natpub-2.komreg.net:
             - 'fe-tug-3.komreg.net'
          port: '443'
 
+natpub-test-2-komreg.net:
+   autoupdate:
+   md_publisher:
+     keyname: natpub-test-2.komreg.net_infra
+   mdsl_publisher:
+   sunet::frontend::register_sites:
+     sites:
+       'test.md.swedenconnect.se':
+         frontends:
+            - 'fe-fre-1.test.komreg.net'
+            - 'fe-tug-1.test.komreg.net'
+         port: '443'
+
 eupub-2.komreg.net:
    autoupdate:
    md_publisher:
@@ -659,6 +658,12 @@ eupub-2.komreg.net:
             - 'fe-tug-3.komreg.net'
          port: '443'
 
+eupub-test-2.komreg.net:
+   autoupdate:
+   md_publisher:
+     keyname: eupub-test-2.komreg.net_infra
+   mdsl_publisher:
+
 nic.komreg.net:
    sunet_iaas_cloud:
    autoupdate:
@@ -906,6 +911,12 @@ demw-2.sveidas.se:
             - 'fe-tug-3.komreg.net'
          port: '443'
 
+validator-1-test.komreg.net:
+   eid::dockerhost:
+      version: '5:20.10.6~3-0~ubuntu-focal'
+   konsulter:
+   autoupdate:
+
 '^eidas-proxy-[0-9]+\.sveidas\.se$':
    eid::dockerhost:
       version: '5:20.10.8~3-0~ubuntu-bionic'