r00t2
/
vaultpass
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixing typo'd symlink, adding minor fixes

This commit is contained in:
brent s. 2020-04-02 09:07:01 -04:00
parent c0aa98fc4b
commit 93e45e8db9
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/spawn.py
View File

@ -14,7 +14,7 @@ import psutil
from lxml import etree from lxml import etree
## ##
from . import serverconf from . import serverconf
from . import vauptpassconf from . import vaultpassconf




_url_re = re.compile(r'^(?P<proto>https?)://(?P<addr>[^:/]+)(:(?P<port>[0-9]+)?)?(?P<path>/.*)?$') _url_re = re.compile(r'^(?P<proto>https?)://(?P<addr>[^:/]+)(:(?P<port>[0-9]+)?)?(?P<path>/.*)?$')
@ -86,7 +86,7 @@ class VaultSpawner(object):
if not fpath: if not fpath:
fpath = self.clientconf_file fpath = self.clientconf_file
clientconf = os.path.abspath(os.path.expanduser(fpath)) clientconf = os.path.abspath(os.path.expanduser(fpath))
self.client_conf = vauptpassconf.getConfig(clientconf) self.client_conf = vaultpassconf.getConfig(clientconf)
return(None) return(None)


def _getCreds(self, new_unseal = None, new_auth = None, write_conf = None): def _getCreds(self, new_unseal = None, new_auth = None, write_conf = None):
@ -117,6 +117,7 @@ class VaultSpawner(object):
return(None) return(None)


def _getProcess(self): def _getProcess(self):
# TODO: check for pidfile in self.conf and read if file exists
def clear(): def clear():
self.pid = None self.pid = None
return(None) return(None)
@ -277,3 +278,7 @@ def main():
if args.cleanup: if args.cleanup:
s.cleanup() s.cleanup()
return(None) return(None)


if __name__ == '__main__':
main()

0
testing/vauptpassconf.py → testing/vaultpassconf.py
View File