Update example configuration file to include APC org and realm

diff --git a/redhat/organizations.cfg b/redhat/organizations.cfg
index 5c190b8..f0886fd 100644 (file)
--- a/redhat/organizations.cfg
+++ b/redhat/organizations.cfg
@@ -3,13 +3,16 @@
     {
       "apcs": [],
       "community_id": "apc.x",
-      "idp_realms": ["idp.x", "other.idp.x"],
-      "rp_realms": ["rp.x", "other.rp.x"],
+      "idp_realms": ["apc.x",
+                     "idp.x",
+                     "other.idp.x"],
+      "rp_realms": ["rp.x",
+                    "other.rp.x"],
       "type": "apc",
-      "expiration_interval": 10
+      "expiration_interval": 30
     },
     {
-      "apcs": ["apc."],
+      "apcs": ["apc.x"],
       "community_id": "coi.x",
       "idp_realms": ["idp.x"],
       "rp_realms": ["rp.x"],
@@ -18,67 +21,83 @@
   ],
   "local_organizations": [
     {
+      "organization_name": "APC",
+      "realms": [
+        {
+          "realm": "apc.x",
+          "identity_provider": {
+            "aaa_servers": [
+              "apc.local"
+            ],
+            "apcs": [
+              "apc.x"
+            ],
+            "shared_config": "no"
+          }
+        }
+      ]
+    },
+    {
       "organization_name": "Demo Organization",
       "realms": [
-       {
-         "realm": "rp.x",
-         "gss_names": ["alpha-cred@apc.x",
-                       "beta-cred@apc.x",
-                       "gamma-cred@apc.x"],
-         "filters": {
-           "tid_inbound": [
-             {
-               "action": "accept",
-               "domain_constraints": [
-                 "*.local"
-               ],
-               "specs": [
-                 {
-                   "field": "rp_realm",
-                   "match": "rp.x"
-                 },
-                 {
-                   "field": "rp_realm",
-                   "match": "*.rp.x"
-                 }
-               ],
-               "realm_constraints": [
-                 "rp.x", "*.rp.x"
-               ]
-             }
-           ]
-         }
-       },
+        {
+          "realm": "rp.x",
+          "gss_names": ["rp-cred@apc.x",
+                        "second-rp-cred@apc.x"],
+          "filters": {
+            "tid_inbound": [
+              {
+                "action": "accept",
+                "domain_constraints": [
+                  "*.local"
+                ],
+                "specs": [
+                  {
+                    "field": "rp_realm",
+                    "match": "rp.x"
+                  },
+                  {
+                    "field": "rp_realm",
+                    "match": "*.rp.x"
+                  }
+                ],
+                "realm_constraints": [
+                  "rp.x", "*.rp.x"
+                ]
+              }
+            ]
+          }
+        },
         {
           "realm": "other.rp.x",
-          "gss_names": ["something@apc.x"]
+          "gss_names": ["other-rp-cred@apc.x"]
         },
-       {
-         "realm": "idp.x",
-         "gss_names": ["alpha-cred@apc.x"],
-         "identity_provider": {
-           "aaa_servers": ["alpha.local"],
-           "apcs": ["apc.x"],
-           "shared_config": "no"
-         }
+        {
+          "realm": "idp.x",
+          "gss_names": ["idp-cred@apc.x"],
+          "identity_provider": {
+            "aaa_servers": ["idp.local"],
+            "apcs": ["apc.x"],
+            "shared_config": "no"
+          }
         },
-       {
-         "realm": "other.idp.x",
-         "gss_names": ["beta-cred@apc.x"],
-         "identity_provider": {
-           "aaa_servers": ["alpha.local"],
-           "apcs": ["apc.x"],
-           "shared_config": "no"
-         }
-       }
+        {
+          "realm": "other.idp.x",
+          "gss_names": ["other-idp-cred@apc.x"],
+          "identity_provider": {
+            "aaa_servers": ["idp.local"],
+            "apcs": ["apc.x"],
+            "shared_config": "no"
+          }
+        }
       ]
     }
   ],
   "peer_organizations": [
     {
-      "hostname": "gamma.local",
+      "hostname": "peer.example.com",
       "port": 12310,
-      "gss_names": ["gamma-cred@apc.x"]
+      "gss_names": ["peer-cred@apc.x"]
     }
   ]
 }

diff --git a/tr/organizations.cfg b/tr/organizations.cfg
index 5c190b8..f0886fd 100644 (file)
--- a/tr/organizations.cfg
+++ b/tr/organizations.cfg
@@ -3,13 +3,16 @@
     {
       "apcs": [],
       "community_id": "apc.x",
-      "idp_realms": ["idp.x", "other.idp.x"],
-      "rp_realms": ["rp.x", "other.rp.x"],
+      "idp_realms": ["apc.x",
+                     "idp.x",
+                     "other.idp.x"],
+      "rp_realms": ["rp.x",
+                    "other.rp.x"],
       "type": "apc",
-      "expiration_interval": 10
+      "expiration_interval": 30
     },
     {
-      "apcs": ["apc."],
+      "apcs": ["apc.x"],
       "community_id": "coi.x",
       "idp_realms": ["idp.x"],
       "rp_realms": ["rp.x"],
@@ -18,67 +21,83 @@
   ],
   "local_organizations": [
     {
+      "organization_name": "APC",
+      "realms": [
+        {
+          "realm": "apc.x",
+          "identity_provider": {
+            "aaa_servers": [
+              "apc.local"
+            ],
+            "apcs": [
+              "apc.x"
+            ],
+            "shared_config": "no"
+          }
+        }
+      ]
+    },
+    {
       "organization_name": "Demo Organization",
       "realms": [
-       {
-         "realm": "rp.x",
-         "gss_names": ["alpha-cred@apc.x",
-                       "beta-cred@apc.x",
-                       "gamma-cred@apc.x"],
-         "filters": {
-           "tid_inbound": [
-             {
-               "action": "accept",
-               "domain_constraints": [
-                 "*.local"
-               ],
-               "specs": [
-                 {
-                   "field": "rp_realm",
-                   "match": "rp.x"
-                 },
-                 {
-                   "field": "rp_realm",
-                   "match": "*.rp.x"
-                 }
-               ],
-               "realm_constraints": [
-                 "rp.x", "*.rp.x"
-               ]
-             }
-           ]
-         }
-       },
+        {
+          "realm": "rp.x",
+          "gss_names": ["rp-cred@apc.x",
+                        "second-rp-cred@apc.x"],
+          "filters": {
+            "tid_inbound": [
+              {
+                "action": "accept",
+                "domain_constraints": [
+                  "*.local"
+                ],
+                "specs": [
+                  {
+                    "field": "rp_realm",
+                    "match": "rp.x"
+                  },
+                  {
+                    "field": "rp_realm",
+                    "match": "*.rp.x"
+                  }
+                ],
+                "realm_constraints": [
+                  "rp.x", "*.rp.x"
+                ]
+              }
+            ]
+          }
+        },
         {
           "realm": "other.rp.x",
-          "gss_names": ["something@apc.x"]
+          "gss_names": ["other-rp-cred@apc.x"]
         },
-       {
-         "realm": "idp.x",
-         "gss_names": ["alpha-cred@apc.x"],
-         "identity_provider": {
-           "aaa_servers": ["alpha.local"],
-           "apcs": ["apc.x"],
-           "shared_config": "no"
-         }
+        {
+          "realm": "idp.x",
+          "gss_names": ["idp-cred@apc.x"],
+          "identity_provider": {
+            "aaa_servers": ["idp.local"],
+            "apcs": ["apc.x"],
+            "shared_config": "no"
+          }
         },
-       {
-         "realm": "other.idp.x",
-         "gss_names": ["beta-cred@apc.x"],
-         "identity_provider": {
-           "aaa_servers": ["alpha.local"],
-           "apcs": ["apc.x"],
-           "shared_config": "no"
-         }
-       }
+        {
+          "realm": "other.idp.x",
+          "gss_names": ["other-idp-cred@apc.x"],
+          "identity_provider": {
+            "aaa_servers": ["idp.local"],
+            "apcs": ["apc.x"],
+            "shared_config": "no"
+          }
+        }
       ]
     }
   ],
   "peer_organizations": [
     {
-      "hostname": "gamma.local",
+      "hostname": "peer.example.com",
       "port": 12310,
-      "gss_names": ["gamma-cred@apc.x"]
+      "gss_names": ["peer-cred@apc.x"]
     }
   ]
 }