Added formalized config defaults

Refactor reading of config
Move config schemas to separate file

1 files changed, 5 insertions, 64 deletions

diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index 35ecb91..e6c5ec6 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -566,65 +566,6 @@ def gen_manpage(manpagedir):
     manpage.rewrite_manpage(manpagedir + "/catlfish-log.cfg.in.5.adoc", globalconfigschema, "Catlfish", "Catlfish Manual", "CATLFISH-LOG.CFG.IN(5)", "catlfish-log.cfg.in - catlfish log configuration")
     manpage.rewrite_manpage(manpagedir + "/catlfish-node.cfg.5.adoc", localconfigschema, "Catlfish", "Catlfish Manual", "CATLFISH-NODE.CFG(5)", "catlfish-node.cfg - catlfish node configuration")
 
-localconfigschema = [
-    ("nodename", "string", "nodename"),
-    ("frontendaddress", "string", "ip address"),
-    ("ctapiaddress", "string", "ip address"),
-    ("storageaddress", "string", "ip address"),
-    ("signingaddress", "string", "ip address"),
-    ("mergeaddress", "string", "ip address"),
-    ("publichttpaddress", "string", "ip address"),
-    ("configurl", "string", "url"),
-    ("logadminkey", "string", "key"),
-    ("dbbackend", "string", ["permdb", "fsdb"]),
-    ("paths/configdir", "string", "path"),
-    ("paths/db", "string", "path"),
-    ("paths/https_cacertfile", "string", "path"),
-    ("paths/https_certfile", "string", "path"),
-    ("paths/https_keyfile", "string", "path"),
-    ("paths/knownroots", "string", "path"),
-    ("paths/logpublickey", "string", "path"),
-    ("paths/privatekeys", "string", "path"),
-    ("paths/public_cacertfile", "string", "path"),
-    ("paths/publickeys", "string", "path"),
-    ("paths/verifycert_bin", "string", "path"),
-    ("paths/mergedb", "string", "path"),
-    ("paths/logprivatekey", "string", "path"),
-    ("ratelimits/add_chain", "string", "rate"),
-    ("merge/min-delay", "integer", "seconds"),
-    ("merge/backup-window-size", "integer", "number of entries"),
-    ("merge/backup-sendlog-chunksize", "integer", "number of entries"),
-    ("merge/backup-sendentries-chunksize", "integer", "number of entries"),
-    ("merge/dist-window-size", "integer", "number of entries"),
-    ("merge/dist-sendlog-chunksize", "integer", "number of entries"),
-    ("merge/dist-sendentries-chunksize", "integer", "number of entries"),
-]
-
-globalconfigschema = [
-    ("frontendnodes/[]/name", "string", "nodename"),
-    ("frontendnodes/[]/address", "string", "ip address"),
-    ("frontendnodes/[]/publicaddress", "string", "ip address"),
-    ("mergenodes/[]/name", "string", "nodename"),
-    ("mergenodes/[]/address", "string", "ip address"),
-    ("signingnodes/[]/name", "string", "nodename"),
-    ("signingnodes/[]/address", "string", "ip address"),
-    ("storagenodes/[]/name", "string", "nodename"),
-    ("storagenodes/[]/address", "string", "ip address"),
-    ("statusservers/[]/name", "string", "nodename"),
-    ("statusservers/[]/address", "string", "ip address"),
-    ("statusservers/[]/publicaddress", "string", "ip address"),
-    ("apikeys/[]/nodename", "string", "nodename"),
-    ("apikeys/[]/publickey", "string", "key"),
-    ("baseurl", "string", "url"),
-    ("primarymergenode", "string", "nodename"),
-    ("storage-quorum-size", "integer", "number of nodes"),
-    ("backup-quorum-size", "integer", "number of nodes"),
-    ("logpublickey", "string", "key"),
-    ("cafingerprint", "string", "fingerprint"),
-    ("version", "integer", "version"),
-    ("mmd", "integer", "seconds"),
-]
-
 def main():
     parser = argparse.ArgumentParser(description="")
     parser.add_argument('--config', help="System configuration")
@@ -644,17 +585,17 @@ def main():
         sys.exit(1)
 
     if args.testmakefile:
-        config = readconfig.read_config(args.config, schema=globalconfigschema)
+        config = readconfig.read_config(args.config, localconfig=False)
         gen_testmakefile(config, args.testmakefile)
     elif args.testshellvars:
-        config = readconfig.read_config(args.config, schema=globalconfigschema)
+        config = readconfig.read_config(args.config, localconfig=False)
         gen_testmakefile(config, args.testshellvars, shellvars=True)
     elif args.getnodenames:
-        config = readconfig.read_config(args.config, schema=globalconfigschema)
+        config = readconfig.read_config(args.config, localconfig=False)
         printnodenames(config)
     elif args.localconfig:
-        localconfig = readconfig.read_config(args.localconfig, schema=localconfigschema)
-        config = readconfig.verify_and_read_config(args.config, localconfig["logadminkey"], schema=globalconfigschema)
+        localconfig = readconfig.read_config(args.localconfig)
+        config = readconfig.verify_and_read_config(args.config, localconfig["logadminkey"])
 
         gen_config(localconfig["nodename"], config, localconfig)
     else: