From 93e45e8db9c9c71a687efb0022ad48b0962af3ac Mon Sep 17 00:00:00 2001 From: brent s Date: Thu, 2 Apr 2020 09:07:01 -0400 Subject: [PATCH] fixing typo'd symlink, adding minor fixes --- testing/spawn.py | 9 +++++++-- testing/{vauptpassconf.py => vaultpassconf.py} | 0 2 files changed, 7 insertions(+), 2 deletions(-) rename testing/{vauptpassconf.py => vaultpassconf.py} (100%) diff --git a/testing/spawn.py b/testing/spawn.py index 20e4c3d..2a105d3 100755 --- a/testing/spawn.py +++ b/testing/spawn.py @@ -14,7 +14,7 @@ import psutil from lxml import etree ## from . import serverconf -from . import vauptpassconf +from . import vaultpassconf _url_re = re.compile(r'^(?Phttps?)://(?P[^:/]+)(:(?P[0-9]+)?)?(?P/.*)?$') @@ -86,7 +86,7 @@ class VaultSpawner(object): if not fpath: fpath = self.clientconf_file clientconf = os.path.abspath(os.path.expanduser(fpath)) - self.client_conf = vauptpassconf.getConfig(clientconf) + self.client_conf = vaultpassconf.getConfig(clientconf) return(None) def _getCreds(self, new_unseal = None, new_auth = None, write_conf = None): @@ -117,6 +117,7 @@ class VaultSpawner(object): return(None) def _getProcess(self): + # TODO: check for pidfile in self.conf and read if file exists def clear(): self.pid = None return(None) @@ -277,3 +278,7 @@ def main(): if args.cleanup: s.cleanup() return(None) + + +if __name__ == '__main__': + main() diff --git a/testing/vauptpassconf.py b/testing/vaultpassconf.py similarity index 100% rename from testing/vauptpassconf.py rename to testing/vaultpassconf.py