Commit graph

322 commits

Author SHA1 Message Date
telsacolton
133cbee473 Give reasonable error when symlink fails
When a symlink fails because the path already exists and force=no, we should output path in the error message instead of source.
2014-05-14 16:31:20 -05:00
James Cammarata
8c7aafd5ae Merge branch 'file_new_dirs_perms' of https://github.com/bcoca/ansible into bcoca-file_new_dirs_perms 2014-05-14 13:53:08 -05:00
Mikhail Emelchenkov
cadb57f446 Fixed incorrect handling of paths contaiin whitespaces 2014-05-13 17:05:44 +04:00
James Cammarata
7faf766305 Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel 2014-05-09 00:31:39 -05:00
James Cammarata
261fe0ea96 Merge pull request #7013 from orgoj/replace-patch-changed
module replace - report changed only if contents is changed
2014-05-08 15:14:19 -05:00
Brian Coca
6cad8620d5 reworded copy option docs to be clearer 2014-05-06 08:31:26 -04:00
James Cammarata
5ce5ba5e58 Refuse to convert a non-empty directory into a link with the file module
Also adds an integration test for the above.

Fixes #7254
2014-05-02 14:46:38 -05:00
someda
5bb888af4b fix #7244 recursive copy fails when setting directory attributes
- reverse the order of new_directory_list returned from split_pre_existing_dir in copy module
2014-05-02 01:38:16 +09:00
Michael DeHaan
f57f9c950f Merge pull request #7119 from jjshoe/patch-4
Finish reverting a broken commit in #5679
2014-04-29 16:47:46 -04:00
James Cammarata
b53bf7c8b1 Minor tweak to rsync_path construction in synchronize module
Fixes #7182
2014-04-29 15:47:16 -05:00
Carlos E. Garcia
4dcaa9d9fb multiple spelling error changes 2014-04-29 10:41:05 -04:00
Skyler Leigh Amador
6eb8759ec5 Remove --timeout option to rsync from synchronize defaults
The current 10-second default timeout for rsync seems to be behind issue #6809.

As a workaround for the underlying issue in rsync when different versions are
used on the source and destination sides, don't include the timeout option
unless the user specifies a timeout > 0.
2014-04-27 20:21:54 -07:00
Joel Schuweiler
aed596088b Finish reverting #b73cddc 2014-04-27 09:36:13 -05:00
jjshoe
6f0808b23b Ensure the validation string has %s in it 2014-04-27 09:30:36 -05:00
Brian Coca
1e3860c47b now when making multiple dirs in path to make dir, same permissions are assigned (but only for NEW dirs)
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2014-04-23 10:38:38 -04:00
Erika Heidi
40e7c6eddc Possible docs error: 'path' instead of 'src'
I came to this example today (line 50), and when I tried it, I got an error:

`msg: src and dest are required for creating links`

So, I changed **path** to **src** and it worked fine. Looks like the example is wrong, since the docs say "dest" is already an alias for "path", in which case we would have 2 "path" definitions.
2014-04-23 16:00:22 +02:00
Michael Heca
6618c1e8b5 module replace - report changed only if contents is changed 2014-04-16 09:25:56 +02:00
James Cammarata
39356bd83b Get the bin path for commands in the unarchive module
Fixes #6927
2014-04-15 20:39:22 -05:00
James Tanner
0f82a2b53c Addresses #6702 Remove version_added from description string 2014-04-11 11:18:05 -04:00
James Tanner
f2c9c2c141 Addresses #6702 set version_added for rsync_opts 2014-04-11 11:04:05 -04:00
jctanner
7a6267690e Merge pull request #6702 from jjshoe/devel
Allow you to pass in arbitrary rsync options
2014-04-11 10:43:14 -04:00
James Tanner
fec4c797d9 Fixes #6929 remote file module doc fragments from copy and template 2014-04-10 16:06:35 -04:00
James Tanner
199992adb6 Fixes #6894 create docs fragment for files 2014-04-08 13:20:15 -04:00
James Cammarata
8f325afe38 Fixing newline escapes in lineinfile
Fixes #5679
2014-04-08 11:42:29 -05:00
James Cammarata
7a03cc69e1 Revert "Fix #5679 again after recent changes in core"
This reverts commit 2bfaacd170.

Fixes #6821
2014-04-07 09:55:59 -05:00
Richard C Isaacson
465b97be7e assemble module: fix insertion of newlines when not needed.
This builds on GH-6359 and changes the logic so that a newline is only inserted between fragments if the previous fragment does not end with a newline.
2014-04-03 16:32:35 -05:00
Peter Gehres
53c1d25c70 Fix for #6353 adding a newline between assembled files 2014-04-03 16:32:35 -05:00
Michael DeHaan
63a1330263 Use common file argument system previously implemented by @sivel for rax modules on the file modules as well (copy/file/template).
Application to other cloud providers would make very good sense.
2014-04-03 16:52:39 -04:00
James Tanner
7b72004eb4 Merge #5903 from rhaido/ansible
Update files documentation for usage of force=True and hardlinks
2014-03-31 12:53:03 -04:00
cgtx
bb3fed67aa backreferences should be double escaped 2014-03-29 18:14:56 -05:00
Michael DeHaan
a8b345ad38 Repairs for documentation build. 2014-03-28 14:57:29 -04:00
Michael DeHaan
f596ee8850 Slight docs tweak, split lines according to code standards 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
2a66f356b1 correct documentation comment and version_added in "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
7cd21a47ef Add STDOUT lines in response of "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
33b440ac9f Add "checksum" option support to 'synchronize' module 2014-03-28 14:04:59 -04:00
Michael DeHaan
d1975c906f Merge branch 'update_docs_validate_cmd_not_passed_via_shell' of git://github.com/rwehner/ansible into devel
Conflicts:
	library/files/template
2014-03-28 11:21:41 -04:00
Michael DeHaan
38c3332b8a Merge pull request #6597 from tarka/handle-uncreated-symlink-tmpfile
Handle missing symlink tempfile
2014-03-28 11:11:32 -04:00
jjshoe
a5794f5d8c Allow you to pass in arbitrary rsync options. I also added help for it, and what version it was added in. 2014-03-27 08:00:20 -05:00
Jeff Geerling
177bf3eb20 Fixed template validation docs and example. 2014-03-26 12:42:15 -05:00
jjshoe
e62b38c250 Show argument dependency
failed: [192.168.1.2] => {"cmd": "rsync --delay-updates -FF --compress --timeout=10 --delete-after --rsh 'ssh -i /home/jjshoe/.vagrant.d/insecure_private_key -o StrictHostKeyChecking=no' --rsync-path 'sudo rsync' --out-format='<<CHANGED>>%i %n%L' /tmp/app vagrant@192.168.1.2:/home/ubuntu/app", "failed": true, "item": "", "rc": 1}
msg: rsync: --delete does not work without --recursive (-r) or --dirs (-d).
rsync error: syntax or usage error (code 1) at main.c(1453) [client=3.0.9]
2014-03-26 08:32:55 -05:00
James Cammarata
68327fa172 Cleanup from merge of replace module and CHANGELOG update 2014-03-25 11:13:51 -05:00
James Cammarata
2c05e337cb Merge branch 'devel' of https://github.com/EvanK/ansible into EvanK-devel 2014-03-25 10:38:59 -05:00
James Cammarata
d6a2befb0d Merge branch 'file_fixes_agg' of https://github.com/bcoca/ansible into bcoca-file_fixes_agg 2014-03-24 16:38:35 -05:00
Robert Wehner
406317371b Update 'validate=' parameter documentation to make clear that the command
passed via this paramter is not passed via shell and so all shell features
will not work.
2014-03-24 09:06:25 -06:00
James Tanner
7c263fcdad Fixes #6590 add set_remote_user parameter to synchronize
This allows usage of custom ssh configs for remote hosts where
the inventory user does not match the configured user.
2014-03-20 13:56:07 -04:00
Steve Smith
5b5af14921 Only unlink the symlink tempfile on error if it was created in the
previous operation.
2014-03-20 13:14:24 +01:00
Brian Coca
a395eb3aba fixed issue with tmp file (path can include filename) and added missing
else which made it try to link x2
2014-03-20 07:55:53 -04:00
Brian Coca
4fd957620a now correctly checks absolute path for src= existance for links
also updated docs to be a bit clearer on symlink behaviour
2014-03-20 07:49:25 -04:00
Brian Coca
402cd11c52 fixed issue with directory permissions on copy #6552 2014-03-18 22:29:22 -04:00
James Cammarata
d60ac967b9 Merge branch 'file_fixes_clean' of https://github.com/bcoca/ansible into bcoca-file_fixes_clean 2014-03-17 14:03:26 -05:00
Michael DeHaan
4ec2a79aae Merge pull request #6515 from lotia/fix-acl-doc-and-error
Fix acl doc and error
2014-03-16 13:15:42 -05:00
Ali Asad Lotia
fc5aa9ac28 Whitespace fixes in incompatible param check
- Remove extra whitespace in conditional that checks if etype, entity or
  permissions are also set when entry is set.
2014-03-16 17:49:36 +00:00
Michael DeHaan
ec14b25e23 Merge pull request #6448 from jirutka/fix-5679-2
Fix #5679 again after recent changes in core
2014-03-16 12:43:10 -05:00
Cristian Ciupitu
7f681c33a2 Micro-optimization: replace s.find(x)!=-1 with x in s
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
2014-03-16 13:10:28 -04:00
Ali Asad Lotia
77e6dded62 Fix acl module doc and error messages
- Fix typos in module doc
- Provide clearer error message when entry and etype are both missing
2014-03-16 16:41:37 +00:00
Brian Coca
7ca6343ca3 Fixes and cleanup to file functions and module
- unified set attribute functions ... not sure why 2 identical functions
exist with diff names, now there are 3 while i repoint all modules to 1
- fixed issue with symlinks being created w/o existing src when force=no
- refactored conditionals, simplified where possible
- added tests for symlink to nonexistant source, with both force options
- made symlink on existing attomic (force)
2014-03-15 13:54:24 -04:00
Michael DeHaan
4f1ccfd66f Merge pull request #6504 from follower/patch-2
Fix typo
2014-03-15 09:15:53 -05:00
follower
5beee66d1d Fix typo
"resort" -> "result"
2014-03-15 20:04:38 +13:00
Brian Coca
5dd041ae7e fixed bad detection of change on default and premature break 2014-03-15 01:10:15 -04:00
Jakub Jirutka
f39b8cae95 Fix #5679 again after recent changes in core 2014-03-12 18:21:53 +01:00
Brian Coca
3b98ed15bc now stat skips md5 if file isn't readable 2014-03-11 22:50:05 -04:00
James Tanner
fc33860e5d Force command action to not be executed by the shell unless specifically enabled 2014-03-10 16:13:30 -05:00
Dolph Mathews
289f8f7ed9 spelling correction for "separate"
s/seperate/separate/

http://en.wiktionary.org/wiki/separate
2014-03-08 04:51:34 -06:00
Richard C Isaacson
7fff5abd5b unarchive module: Add creates functionality.
Closes GH-5354.

Forklift copy logic into unarchive. Provides integration unit tests.
2014-03-07 18:19:46 -06:00
Michael DeHaan
87677c96c6 Merge pull request #6308 from muffl0n/file_fix_documentation
Module "file": Fix link to "path" in documentation
2014-03-06 11:04:47 -06:00
James Cammarata
bdd3ccec65 Un-escape newlines in delimiters for assemble module 2014-03-06 09:44:56 -06:00
Sven Schliesing
b55f99b803 Fix link in documentation
c(dest) -> c(path)
2014-03-06 13:16:29 +01:00
Michael DeHaan
2f12c6ddf6 Simplify file module parameter description. 2014-02-28 13:55:07 -05:00
Richard C Isaacson
7263148156 Typo fix. 2014-02-28 11:02:58 -06:00
Richard C Isaacson
1e2eb88926 Replace mode with octal renaming to mode.
Closes GH-6176

This way for mode we return in an octal format which is immediately usable compared to transforming it later.
2014-02-28 10:42:20 -06:00
Richard Isaacson
6ffeaa7ddd Merge pull request #1 from bcoca/stat_updaates
added octal representation of mode and made md5 checksumming optional
2014-02-28 10:39:41 -06:00
Richard C Isaacson
a707e858cd Minor cleanup. 2014-02-28 10:04:05 -06:00
Richard C Isaacson
3ca9fc64d5 copy module: cleanup and if directory_mode not set default to umask 2014-02-28 10:00:54 -06:00
Richard C Isaacson
326ed4eeeb Copy Module: Add the ability to set directory attributes on recursive copy.
Closes GH-6194.

These changes pass attribute modifications through to new directories during a recursive copy with an addition allowing for the directory mode to be set independantly.
2014-02-28 01:14:32 -06:00
James Cammarata
b667e1d404 Add expanduser calls on src/dest in the module too 2014-02-26 15:19:45 -06:00
James Cammarata
1762557ff4 Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel 2014-02-26 12:28:26 -06:00
Brian Coca
21854d54d4 added octal representation of mode and made md5 checksumming optional
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2014-02-25 21:33:14 -05:00
James Cammarata
6283754340 Fixing several bugs in assemble and updating tests
Bugfixes:
* the remote_src param was not being converted to a boolean correctly,
  resulting in it never being used by the module as the default behavior
  was remote_src=True (issue #5581)
* the remote_src param was not listed in the generic file params, leading
  to a failure when the above bug regarding remote_src was fixed
* the delimiter should always end with a newline to ensure that the file
  fragments do not run together on one line

Fixes #5581
2014-02-24 14:27:23 -06:00
James Cammarata
33d9a662ee Adding new tests for assemble role 2014-02-24 14:27:23 -06:00
James Cammarata
d80b9ac137 Adding the backup destination to the resut dictionary for lineinfile 2014-02-20 13:31:54 -05:00
muffl0n
68bef304c8 already call expanduser in action_plugin 2014-02-19 21:41:57 +01:00
Michael DeHaan
62f8ebe51e Merge pull request #6036 from mxxcon/patch-1
docs_pull_request: Add parameters highlighting
2014-02-18 13:58:44 -05:00
James Cammarata
f1ba67e547 Merge branch 'fix-5679' of https://github.com/jirutka/ansible into jirutka-fix-5679 2014-02-17 14:54:29 -06:00
mxxcon
544c08a211 docs_pull_request: Add parameters highlighting
Added highlighting to parameter references in docs so that they standout a bit better.
2014-02-15 23:26:21 -05:00
Michael DeHaan
77ac23cc26 Document ansible_managed changing the template. 2014-02-15 14:13:42 -05:00
Michael DeHaan
b1e442639f Some minor docs corrections. 2014-02-15 14:05:42 -05:00
Richard C Isaacson
54c799d3fb Cleanup per notes.
Some small changes to per notes from @mpdehann.
2014-02-12 10:01:10 -06:00
Richard C Isaacson
9795eec24b Updates for the unarchive module and action_plugin.
There is a bit going on with the changes here. Most of the changes are cleanup of files so that they line up with the standard files.

PR #5136 was merged into the current devel and brought up to working order. A few bug fixes had to be done to get the code to test correctly. Thanks out to @pib!

Issue #5431 was not able to be confirmed as it behaved as expected with a sudo user.

Tests were added via a playbook with archive files to verify functionality.

All tests fire clean including custom playbooks across multiple linux and solaris systems.
2014-02-12 01:57:00 -06:00
Richard C Isaacson
a3be027909 Merge remote-tracking branch 'pib/unarchive_remote' into pull_5136 2014-02-11 22:55:34 -06:00
Mike Grozak
3f74dd6592 Updated the force parameter description; added one example how to create the symlinks pointing to non-absolute paths 2014-02-07 14:29:20 +01:00
Mike Grozak
ecd8b5d064 Found a way how to have symlinks towards files without absolute paths in prefixes; fixed incorrect force setting on the hard links, which can not point to non-existing files 2014-02-07 14:13:41 +01:00
Mike Grozak
4f262779cd Started the development of the 'chdir' functionality for file module - creation symlinks without the base directory prefix 2014-02-06 17:20:32 +01:00
jctanner
5a6fc3d940 Merge pull request #5363 from bcoca/acl_improved
acl module: acl now supports 'default'
2014-02-05 18:40:59 -05:00
Brian Coca
3aa3a42c45 fixed docstring and changed type to etype avoiding python builtin
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2014-02-05 18:36:29 -05:00
jctanner
552ce8b68c Merge pull request #5051 from deontologician/patch-1
Added -FF flag to rsync invocation in synchronize
2014-02-05 12:02:48 -05:00
jctanner
e13a10def7 Merge pull request #5127 from ovcharenko/patches
synchronize module: Added existing_only options to skip creating new files on receiver
2014-02-05 11:49:05 -05:00
jctanner
27362ebbf1 Merge pull request #5187 from 42wim/devel
Add support for --copy-links in synchronize
2014-02-05 11:26:08 -05:00
Michael DeHaan
f16f2f23f5 Update copy
Update copy documentation to reference synchronize module
2014-01-30 17:43:40 -05:00
Wim
7b8918d37c Add support for --copy-links 2014-01-29 23:05:51 +01:00
Jan-Piet Mens
95c826a533 documentation typos 2014-01-21 09:03:14 +01:00