From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 10 Oct 2019 19:29:10 +0000 (+0100)
Subject: test: Move common config into test script
X-Git-Tag: v0.5.0~131
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=6d68f5cf662673961c50cd4490bfcd11e576aea1;p=secnet.git

test: Move common config into test script

No functional change.  This duplicates the example, and we are going
to modify/parameterise the copy in "invoke".

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/test/invoke b/test/invoke
index 24e8fca..ef66106 100755
--- a/test/invoke
+++ b/test/invoke
@@ -51,9 +51,22 @@ proc mkconf {which} {
 	local-key rsa-private(\"test-example/$which.key\");
 "
     append cfg $extra($which)
-    append cfg "
-	include test-example/common.conf
-    "
+    append cfg {
+	log logfile {
+	    filename "/dev/tty";
+	    class "info","notice","warning","error","security","fatal";
+	};
+	system {
+	    userid "secnet";
+	};
+	resolver adns {
+	};
+	log-events "all";
+	random randomfile("/dev/urandom",no);
+	transform eax-serpent { }, serpent256-cbc { };
+	include test-example/sites.conf
+	sites map(site,vpn/test-example/all-sites);
+    }
     return $cfg
 }