Updated config file with complete, consistent config for Trust Router 1.0.

diff --git a/tr/portal.cfg b/tr/portal.cfg
index 9044e5a..5541fd4 100644 (file)
--- a/tr/portal.cfg
+++ b/tr/portal.cfg
@@ -1,102 +1,136 @@
 {
-    "communities": [
-        {
-            "apcs": [], 
-            "community_id": "pci-community.ja.net", 
-            "idp_realms": [], 
-            "rp_realms": [], 
-            "type": "apc"
-        }, 
-        {
-            "apcs": [], 
-            "community_id": "community.ja.net", 
-            "idp_realms": [], 
-            "rp_realms": [], 
-            "type": "apc"
-        }, 
-        {
-            "apcs": [
-                "pci-community.ja.net"
-            ], 
-            "community_id": "comm.offcenter.org", 
-            "idp_realms": [
-                "idr2.offcenter.org"
-            ], 
-            "rp_realms": [
-                "sr3.offcenter.org"
-            ], 
-            "type": "coi"
-        }
-    ], 
-    "idp_realms": [
-        {
-            "aaa_servers": ["10.1.10.90"], 
-            "apcs": ["community.ja.net"], 
-            "realm_id": "ja.net", 
-            "shared_config": "no"
-        }, 
-        {
-            "aaa_servers": ["127.0.0.1"], 
-            "apcs": ["community.ja.net"], 
-            "realm_id": "idr2.offcenter.org", 
-            "shared_config": "no"
-        }, 
-        {
-            "aaa_servers": ["127.0.0.1"], 
-            "apcs": ["community.ja.net"], 
-            "realm_id": "idr1.offcenter.org", 
-            "shared_config": "yes"
-        }, 
-        {
-            "aaa_servers": ["127.0.0.1"], 
-            "apcs": ["community.ja.net"], 
-            "realm_id": "no-longer-untitled.offcenter.org", 
-            "shared_config": "yes"
-        }
-    ], 
-    "rp_clients": [
-        {
-            "filter": {
-                "filter_lines": [
-                    {
-                        "action": "accept", 
-                        "domain_constraints": [], 
-                        "filter_specs": [
-                            {
-                                "field": "rp_realm", 
-                                "match": "*.exchange.ja.net"
-                            }
-                        ], 
-                        "realm_constraints": []
-                    }
-                ], 
-                "type": "rp_permitted"
-            }, 
-            "gss_names": [
-                "this.is.a.dandy.gss.name@creds.portal.ja.net"
+  "communities": [
+    {
+      "apcs": [
+        "pci-community.ja.net"
+      ],
+      "community_id": "comm.offcenter.org",
+      "idp_realms": [
+        "idr2.offcenter.org"
+      ],
+      "rp_realms": [
+        "sr3.offcenter.org"
+      ],
+      "type": "coi"
+    },
+    {
+      "apcs": [
+
+      ],
+      "community_id": "pci-community.ja.net",
+      "idp_realms": [
+        "idr1.offcenter.org",
+        "idr2.offcenter.org",
+        "ja.net",
+        "no-longer-untitled.offcenter.org"
+      ],
+      "rp_realms": [
+        "exchange.ja.net",
+        "sr3.offcenter.org"
+      ],
+      "type": "apc"
+    }
+  ],
+  "idp_realms": [
+    {
+      "aaa_servers": [
+        "127.0.0.1"
+      ],
+      "apcs": [
+        "pci-community.ja.net"
+      ],
+      "realm_id": "idr1.offcenter.org",
+      "shared_config": "yes"
+    },
+    {
+      "aaa_servers": [
+        "127.0.0.1"
+      ],
+      "apcs": [
+        "pci-community.ja.net"
+      ],
+      "realm_id": "idr2.offcenter.org",
+      "shared_config": "no"
+    },
+    {
+      "aaa_servers": [
+        "10.1.10.90"
+      ],
+      "apcs": [
+        "pci-community.ja.net"
+      ],
+      "realm_id": "ja.net",
+      "shared_config": "no"
+    },
+    {
+      "aaa_servers": [
+        "127.0.0.1"
+      ],
+      "apcs": [
+        "pci-community.ja.net"
+      ],
+      "realm_id": "no-longer-untitled.offcenter.org",
+      "shared_config": "yes"
+    }
+  ],
+  "rp_clients": [
+    {
+      "filter": {
+        "filter_lines": [
+          {
+            "action": "accept",
+            "domain_constraints": [
+
+            ],
+            "filter_specs": [
+              {
+                "field": "rp_realm",
+                "match": "exchange.ja.net"
+              },
+              {
+                "field": "rp_realm",
+                "match": "*.exchange.ja.net"
+              }
+            ],
+            "realm_constraints": [
+
             ]
-        }, 
-        {
-            "filter": {
-                "filter_lines": [
-                    {
-                        "action": "accept", 
-                        "domain_constraints": [], 
-                        "filter_specs": [
-                            {
-                                "field": "rp_realm", 
-                                "match": "*.sr3.offcenter.org"
-                            }
-                        ], 
-                        "realm_constraints": []
-                    }
-                ], 
-                "type": "rp_permitted"
-            }, 
-            "gss_names": [
-                "this.is.a.dandy.gss.name@creds.portal.ja.net"
+          }
+        ],
+        "type": "rp_permitted"
+      },
+      "gss_names": [
+        "01b80aa9-8753-4691-8f8a-f49f7793546f@portal-realm.ja.net"
+      ]
+    },
+    {
+      "filter": {
+        "filter_lines": [
+          {
+            "action": "accept",
+            "domain_constraints": [
+
+            ],
+            "filter_specs": [
+              {
+                "field": "rp_realm",
+                "match": "sr3.offcenter.org"
+              },
+              {
+                "field": "rp_realm",
+                "match": "*.sr3.offcenter.org"
+              }
+            ],
+            "realm_constraints": [
+
             ]
-        }
-    ]
+          }
+        ],
+        "type": "rp_permitted"
+      },
+      "gss_names": [
+        "895c308a-5624-4055-bb4f-ea24b77e6637@portal-realm.ja.net"
+      ]
+    }
+  ]
 }
-