Correct / update example configuration files

  * Combine filter specs into single spec with multiple match strings
  * Use example.com instead of local in example hostnames
  * Remove "max_tree_depth", which is not used

diff --git a/redhat/default-internal.cfg b/redhat/default-internal.cfg
index eef0f61..8b2a77b 100644 (file)
--- a/redhat/default-internal.cfg
+++ b/redhat/default-internal.cfg
@@ -1,6 +1,5 @@
 {
   "tr_internal": {
-    "max_tree_depth": 12,
     "hostname":"beta.example.com",
     "trps_port":12308,
     "tids_port":12309,

diff --git a/redhat/organizations.cfg b/redhat/organizations.cfg
index f0886fd..58f9ac1 100644 (file)
--- a/redhat/organizations.cfg
+++ b/redhat/organizations.cfg
@@ -27,7 +27,7 @@
           "realm": "apc.x",
           "identity_provider": {
             "aaa_servers": [
-              "apc.local"
+              "apc.example.com"
             ],
             "apcs": [
               "apc.x"
@@ -49,16 +49,14 @@
               {
                 "action": "accept",
                 "domain_constraints": [
-                  "*.local"
+                  "*.example.com"
                 ],
                 "specs": [
                   {
                     "field": "rp_realm",
-                    "match": "rp.x"
-                  },
-                  {
-                    "field": "rp_realm",
-                    "match": "*.rp.x"
+                    "match": [
+                      "rp.x", "*.rp.x"
+                    ]
                   }
                 ],
                 "realm_constraints": [
@@ -76,7 +74,7 @@
           "realm": "idp.x",
           "gss_names": ["idp-cred@apc.x"],
           "identity_provider": {
-            "aaa_servers": ["idp.local"],
+            "aaa_servers": ["idp.example.com"],
             "apcs": ["apc.x"],
             "shared_config": "no"
           }
@@ -85,7 +83,7 @@
           "realm": "other.idp.x",
           "gss_names": ["other-idp-cred@apc.x"],
           "identity_provider": {
-            "aaa_servers": ["idp.local"],
+            "aaa_servers": ["idp.example.com"],
             "apcs": ["apc.x"],
             "shared_config": "no"
           }

diff --git a/tr/internal.cfg b/tr/internal.cfg
index eef0f61..5b863d5 100644 (file)
--- a/tr/internal.cfg
+++ b/tr/internal.cfg
@@ -1,7 +1,6 @@
 {
   "tr_internal": {
-    "max_tree_depth": 12,
-    "hostname":"beta.example.com",
+    "hostname":"tr.example.com",
     "trps_port":12308,
     "tids_port":12309,
     "cfg_poll_interval": 1,

diff --git a/tr/organizations.cfg b/tr/organizations.cfg
index f0886fd..58f9ac1 100644 (file)
--- a/tr/organizations.cfg
+++ b/tr/organizations.cfg
@@ -27,7 +27,7 @@
           "realm": "apc.x",
           "identity_provider": {
             "aaa_servers": [
-              "apc.local"
+              "apc.example.com"
             ],
             "apcs": [
               "apc.x"
@@ -49,16 +49,14 @@
               {
                 "action": "accept",
                 "domain_constraints": [
-                  "*.local"
+                  "*.example.com"
                 ],
                 "specs": [
                   {
                     "field": "rp_realm",
-                    "match": "rp.x"
-                  },
-                  {
-                    "field": "rp_realm",
-                    "match": "*.rp.x"
+                    "match": [
+                      "rp.x", "*.rp.x"
+                    ]
                   }
                 ],
                 "realm_constraints": [
@@ -76,7 +74,7 @@
           "realm": "idp.x",
           "gss_names": ["idp-cred@apc.x"],
           "identity_provider": {
-            "aaa_servers": ["idp.local"],
+            "aaa_servers": ["idp.example.com"],
             "apcs": ["apc.x"],
             "shared_config": "no"
           }
@@ -85,7 +83,7 @@
           "realm": "other.idp.x",
           "gss_names": ["other-idp-cred@apc.x"],
           "identity_provider": {
-            "aaa_servers": ["idp.local"],
+            "aaa_servers": ["idp.example.com"],
             "apcs": ["apc.x"],
             "shared_config": "no"
           }