From: Jelte Jansen <jelte@isc.org>
Date: Fri, 15 Jun 2012 12:07:41 +0000 (+0200)
Subject: [1461] make test config files multiline
X-Git-Tag: trac2351_base~226^2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa2055dc9dc9da332361f402408669c3d9203374;p=thirdparty%2Fkea.git

[1461] make test config files multiline
---

diff --git a/tests/lettuce/configurations/ddns/ddns.config.orig b/tests/lettuce/configurations/ddns/ddns.config.orig
index b1883ce1e2..80b92f79df 100644
--- a/tests/lettuce/configurations/ddns/ddns.config.orig
+++ b/tests/lettuce/configurations/ddns/ddns.config.orig
@@ -1 +1,78 @@
-{"Logging": {"loggers": [{"debuglevel": 99, "severity": "DEBUG", "name": "*"}]}, "Zonemgr": {"secondary_zones": [{"class": "IN", "name": "secondary.org"}]}, "Auth": {"database_file": "data/ddns/example.org.sqlite3", "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-xfrout": {"kind": "dispensable", "address": "Xfrout"}, "b10-zonemgr": {"kind": "dispensable", "address": "ZoneMgr"}, "b10-ddns": {"kind": "dispensable", "address": "DDNS"}, "b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}, "version": 2, "DDNS": {"zones": [{"origin": "example.org.", "update_acl": [{"action": "ACCEPT", "from": "127.0.0.1"}], "class": "IN"}, {"origin": "secondary.org.", "update_acl": [{"action": "ACCEPT", "from": "127.0.0.1"}], "class": "IN"}]}}
+{
+    "version": 2,
+    "Logging": {
+        "loggers": [
+            {
+                "debuglevel": 99,
+                "severity": "DEBUG",
+                "name": "*"
+            }
+        ]
+    },
+    "Zonemgr": {
+        "secondary_zones": [
+            {
+                "class": "IN",
+                "name": "secondary.org"
+            }
+        ]
+    },
+    "Auth": {
+        "database_file": "data/ddns/example.org.sqlite3",
+        "listen_on": [
+            {
+                "port": 47806,
+                "address":
+                "127.0.0.1"
+            }
+        ]
+    },
+    "Boss": {
+        "components": {
+            "b10-xfrout": {
+                "kind": "dispensable",
+                "address": "Xfrout"
+            },
+            "b10-zonemgr": {
+                "kind": "dispensable",
+                "address": "ZoneMgr"
+            },
+            "b10-ddns": {
+                "kind": "dispensable",
+                "address": "DDNS"
+            },
+            "b10-auth": {
+                "kind": "needed",
+                "special": "auth"
+            },
+            "b10-cmdctl": {
+                "kind": "needed",
+                "special": "cmdctl"
+            }
+        }
+    },
+    "DDNS": {
+        "zones": [
+            {
+                "origin": "example.org.",
+                "update_acl": [
+                    {
+                        "action": "ACCEPT",
+                        "from": "127.0.0.1"
+                    }
+                ],
+                "class": "IN"
+            },
+            {
+                "origin": "secondary.org.",
+                "update_acl": [
+                    {
+                        "action": "ACCEPT",
+                        "from": "127.0.0.1"
+                    }
+                ],
+                "class": "IN"
+            }
+        ]
+    }
+}
diff --git a/tests/lettuce/configurations/ddns/noddns.config.orig b/tests/lettuce/configurations/ddns/noddns.config.orig
index e44ea4d1c4..c17e76c950 100644
--- a/tests/lettuce/configurations/ddns/noddns.config.orig
+++ b/tests/lettuce/configurations/ddns/noddns.config.orig
@@ -1 +1,29 @@
-{"version": 2, "Logging": {"loggers": [{"severity": "DEBUG", "name": "*", "debuglevel": 99}]}, "DDNS": {"zones": []}, "Auth": {"database_file": "data/ddns/example.org.sqlite3", "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-xfrout": {"kind": "dispensable"}, "b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
+{
+    "version": 2,
+    "Logging": {
+        "loggers": [
+            {
+                "severity": "DEBUG",
+                "name": "*",
+                "debuglevel": 99
+            }
+        ]
+    },
+    "DDNS": {"zones": []},
+    "Auth": {
+        "database_file": "data/ddns/example.org.sqlite3",
+        "listen_on": [
+            {
+                "port": 47806,
+                "address": "127.0.0.1"
+            }
+        ]
+    },
+    "Boss": {
+        "components": {
+            "b10-xfrout": {"kind": "dispensable"},
+            "b10-auth": {"kind": "needed", "special": "auth"},
+            "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}
+        }
+    }
+}