cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add a default value for the -d option of ansible-pull

Browse source 
Thi permit to simplify the command line to use by using
a sensible default, and so reduce the number of incorrect
possible choices and setup needed. Among potential
incorrect choices is using a fixed directory in /tmp, which
could be problematic with a setup whose access is not
properly restricted.
This commit is contained in:
Michael Scherer 2013-10-16 09:03:43 +02:00
parent b0f6e77f66
commit f8b23e5721
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/ansible-pull
View file

@ -122,9 +122,10 @@ def main(args):
'Default is %s.' % DEFAULT_REPO_TYPE) 'Default is %s.' % DEFAULT_REPO_TYPE)
options, args = parser.parse_args(args) options, args = parser.parse_args(args)
hostname = socket.getfqdn()
if not options.dest: if not options.dest:
parser.error("Missing required directory argument") # use a hostname dependent directory, in case of $HOME on nfs
return 1 options.dest = utils.prepare_writeable_dir('~/.ansible/pull/%s' % hostname)
options.dest = os.path.abspath(options.dest) options.dest = os.path.abspath(options.dest)
@ -136,7 +137,7 @@ def main(args):
print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T") print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T")
inv_opts = 'localhost,' inv_opts = 'localhost,'
limit_opts = 'localhost:%s:127.0.0.1' % socket.getfqdn() limit_opts = 'localhost:%s:127.0.0.1' % hostname
base_opts = '-c local --limit "%s"' % limit_opts base_opts = '-c local --limit "%s"' % limit_opts
repo_opts = "name=%s dest=%s" % (options.url, options.dest) repo_opts = "name=%s dest=%s" % (options.url, options.dest)
if options.checkout: if options.checkout:

3
docs/man/man1/ansible-pull.1.asciidoc.in
View file

@ -52,7 +52,8 @@ OPTIONS
*-d* 'DEST', *--directory=*'DEST':: *-d* 'DEST', *--directory=*'DEST'::
Directory to checkout repository into. Directory to checkout repository into. If not provided, a subdirectory of
~/.ansible/pull/ will be used.
*-U* 'URL', *--url=*'URL':: *-U* 'URL', *--url=*'URL'::