From 4cf5a6393a3ab488d70d8b12c315239eadecca15 Mon Sep 17 00:00:00 2001 From: brent s Date: Wed, 13 Sep 2017 18:32:28 -0400 Subject: [PATCH] hitting memory issues on the dump box; need to sync then compress on remote --- gpg/sksdump.py | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/gpg/sksdump.py b/gpg/sksdump.py index 9e7b515..f349abe 100755 --- a/gpg/sksdump.py +++ b/gpg/sksdump.py @@ -16,6 +16,7 @@ # SKSUSER ALL = NOPASSWD: SKSCMDS +import argparse import datetime import getpass import os @@ -26,6 +27,10 @@ from grp import getgrnam NOW = datetime.datetime.utcnow() NOWstr = NOW.strftime('%Y-%m-%d') +# TODO: +# - use a config file system +# - cleanup/rotation should be optional + sks = { # chowning - MAKE SURE THIS IS THE USER SKS RUNS AS. 'user': 'sks', @@ -173,14 +178,38 @@ def syncDB(): subprocess.run(cmd, stdout = f, stderr = f) return() +def parseArgs(): + args = argparse.ArgumentParser(description = 'sksdump - a tool for dumping the SKS Database', + epilog = 'brent s. || 2017 || https://square-r00t.net') + args.add_argument('-d', + '--no-dump', + dest = 'nodump', + action = 'store_true', + help = 'Don\'t dump the SKS DB (default is to dump)') + args.add_argument('-c', + '--no-compress', + dest = 'nocompress', + action = 'store_true', + help = 'Don\'t compress the DB dumps (default is to compress)') + args.add_argument('-s', + '--no-sync', + dest = 'nosync', + action = 'store_true', + help = 'Don\'t sync the dumps to the remote server.') + return(args) + def main(): + args = vars(parseArgs().parse_args()) if getpass.getuser() not in ('root', sks['user']): exit('ERROR: You must be root or {0}!'.format(sks['user'])) with open(sks['logfile'], 'a') as f: f.write('===== {0} STARTING ====='.format(str(datetime.datetime.utcnow()))) - dumpDB() - compressDB() - syncDB() + if not args['nodump']: + dumpDB() + if not args['nocompress']: + compressDB() + if not args['nosync']: + syncDB() with open(sks['logfile'], 'a') as f: f.write('===== {0} DONE ====='.format(str(datetime.datetime.utcnow())))