Merge is now run by shell script tools/merge.

tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0

1 files changed, 0 insertions, 38 deletions

diff --git a/tools/merge.py b/tools/merge.py
deleted file mode 100755
index 212c171..0000000
--- a/tools/merge.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2014-2015, NORDUnet A/S.
-# See LICENSE for licensing information.
-
-import argparse
-import yaml
-import sys
-from certtools import create_ssl_context
-from merge_fetch import merge_fetch
-from merge_backup import merge_backup
-from merge_dist import merge_dist
-
-def main():
-    parser = argparse.ArgumentParser(description="")
-    parser.add_argument('--config', help="System configuration",
-                        required=True)
-    parser.add_argument('--localconfig', help="Local configuration",
-                        required=True)
-    parser.add_argument("--nomerge", action='store_true',
-                        help="Don't actually do merge")
-    parser.add_argument("--timing", action='store_true',
-                        help="Print timing information")
-    args = parser.parse_args()
-
-    config = yaml.load(open(args.config))
-    localconfig = yaml.load(open(args.localconfig))
-    paths = localconfig["paths"]
-
-    create_ssl_context(cafile=paths["https_cacertfile"])
-
-    sth = merge_fetch(args, config, localconfig)
-    merge_backup(args, config, localconfig, sth)
-    merge_dist(args, config, localconfig, sth)
-
-if __name__ == '__main__':
-    sys.exit(main())