Commit graph

263 commits

Author SHA1 Message Date
James Cammarata
d9bb1a480a 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
James Cammarata
b753625dbf 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
50080b3774 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
6b26efdee0 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
ac1948c04c Minor tweak to rsync_path construction in synchronize module
Fixes #7182
2014-04-29 15:47:16 -05:00
Skyler Leigh Amador
a8d9470938 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
5bad971873 Finish reverting #b73cddc 2014-04-27 09:36:13 -05:00
Erika Heidi
036c7a7759 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
a1706e6411 module replace - report changed only if contents is changed 2014-04-16 09:25:56 +02:00
James Cammarata
e8b33636ae Get the bin path for commands in the unarchive module
Fixes #6927
2014-04-15 20:39:22 -05:00
James Tanner
b0556ab1fb Addresses #6702 Remove version_added from description string 2014-04-11 11:18:05 -04:00
James Tanner
42fbbd0502 Addresses #6702 set version_added for rsync_opts 2014-04-11 11:04:05 -04:00
jctanner
bb3ce0c744 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
dfdc3b82a0 Fixes #6929 remote file module doc fragments from copy and template 2014-04-10 16:06:35 -04:00
James Tanner
68cd7258b6 Fixes #6894 create docs fragment for files 2014-04-08 13:20:15 -04:00
James Cammarata
b73cddc485 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
dc93b31d22 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
3ac731087c Fix for #6353 adding a newline between assembled files 2014-04-03 16:32:35 -05:00
Michael DeHaan
1fa19e29e8 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
9fe2bcd076 Merge #5903 from rhaido/ansible
Update files documentation for usage of force=True and hardlinks
2014-03-31 12:53:03 -04:00
cgtx
f6abc17e8a backreferences should be double escaped 2014-03-29 18:14:56 -05:00
Michael DeHaan
8baaf458c7 Repairs for documentation build. 2014-03-28 14:57:29 -04:00
Michael DeHaan
c1fbf80f70 Slight docs tweak, split lines according to code standards 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
838b914a0d correct documentation comment and version_added in "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
c039dbe300 Add STDOUT lines in response of "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
f9ec53cdef Add "checksum" option support to 'synchronize' module 2014-03-28 14:04:59 -04:00
Michael DeHaan
37efa1640f 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
2ddb251538 Merge pull request #6597 from tarka/handle-uncreated-symlink-tmpfile
Handle missing symlink tempfile
2014-03-28 11:11:32 -04:00
jjshoe
d57910b93a 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
8960cba4a3 Fixed template validation docs and example. 2014-03-26 12:42:15 -05:00
jjshoe
12c84dd6bd 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
f2c06cadc3 Cleanup from merge of replace module and CHANGELOG update 2014-03-25 11:13:51 -05:00
James Cammarata
9775872f83 Merge branch 'devel' of https://github.com/EvanK/ansible into EvanK-devel 2014-03-25 10:38:59 -05:00
James Cammarata
d545b73ccb 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
8a19d31391 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
ea5186ca63 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
e157355fd6 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
1b38bd8a40 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
6e6ad97239 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
f6a75ebaf1 fixed issue with directory permissions on copy #6552 2014-03-18 22:29:22 -04:00
James Cammarata
5d8c9d3f0f 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
7286beb15e 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
4a006a78b3 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
5c05982dea 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
0749112286 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
9180013682 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
2d25577e11 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
01b7465a03 Merge pull request #6504 from follower/patch-2
Fix typo
2014-03-15 09:15:53 -05:00
follower
af6109c169 Fix typo
"resort" -> "result"
2014-03-15 20:04:38 +13:00
Brian Coca
b81a3bbb20 fixed bad detection of change on default and premature break 2014-03-15 01:10:15 -04:00