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 24e8fcabc75f795057e9e1b15f3a2085b801f912..ef66106fc79841b9b6a4989398a6e6d08e295d72 100755 (executable)
--- 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
 }