Commit graph

331 commits

Author SHA1 Message Date
James Cammarata
8e3b512293 Merge pull request #7377 from mikhailguru/devel
Fixed handling of paths containing whitespaces in the synchronize module
2014-06-10 06:50:07 -05:00
Ahti Kitsik
1caf9be109 Bugfix to lineinfile to properly handle files with no newline at EOF when using insertafter=EOF.
Looks like #6881 is also affected by this bug.

Currently when using lineinfile insertafter=EOF for a file that has no newline then the added line is not prefixed with a newline.
As a concrete example, ubuntu distro default /etc/ssh/sshd_config has no newline so lineinfile module cannot be used to add a new line to the end of the file.
2014-06-09 19:58:45 +03:00
James Cammarata
43f96a636b Fix issue with symlink path detection
Fixes #7627
Fixes #7664
2014-06-04 23:31:59 -05:00
James Cammarata
7483acde5d Fix linking issue to directories in file module
The os.path.isdir() returns True for symlinks that point to directories,
so we also need to check to make sure it's not a symlink too.

Fixes #7657
2014-06-04 22:48:08 -05:00
Brian Coca
202ac68995 Correctly examine path for relative links in file module
Fixes #7515
Fixes #7537
2014-05-28 11:47:44 -05:00
Kit Westneat
fabe8521cb Fixed documentation for etype parameter on acl module.
The etype parameter just had a copy of the default parameter documentation.
Changed it to reflect what it really is for.
2014-05-27 13:34:01 -04:00
Brian Coca
c24956032d unified calls to fs function vs duplicate functions for file and
directory
2014-05-24 09:28:45 -04:00
James Cammarata
062e82937f Fixing absolute path calculation for file module when linking
Fixes #7403
2014-05-21 12:49:42 -05:00
telsacolton
06963c7826 Make file hardlink error message reasonble
When we hard-link a file, and the link path already exists, give the link path in the error message instead of the source
2014-05-14 16:54:26 -05:00
telsacolton
0d8104b8b7 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
a9311a5dcb 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
a2ca0441ae Fixed incorrect handling of paths contaiin whitespaces 2014-05-13 17:05:44 +04:00
James Cammarata
a18f4b6230 Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel 2014-05-09 00:31:39 -05:00
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
Brian Coca
413a50f87b reworded copy option docs to be clearer 2014-05-06 08:31:26 -04: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
Carlos E. Garcia
7f5dd5e85d multiple spelling error changes 2014-04-29 10:41:05 -04: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
jjshoe
a34478d6f3 Ensure the validation string has %s in it 2014-04-27 09:30:36 -05:00
Brian Coca
f079d022a3 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
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
567f3819b1 Fixing newline escapes in lineinfile
Fixes #5679
2014-04-08 11:42:29 -05: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
Jakub Jirutka
2bfaacd170 Fix #5679 again after recent changes in core 2014-03-12 18:21:53 +01:00
Brian Coca
463a1c21ea now stat skips md5 if file isn't readable 2014-03-11 22:50:05 -04:00
James Tanner
ba0fec4f42 Force command action to not be executed by the shell unless specifically enabled 2014-03-10 16:13:30 -05:00
Dolph Mathews
8808e029f9 spelling correction for "separate"
s/seperate/separate/

http://en.wiktionary.org/wiki/separate
2014-03-08 04:51:34 -06:00
Richard C Isaacson
a483e42583 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
7710867922 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
9f2999df79 Un-escape newlines in delimiters for assemble module 2014-03-06 09:44:56 -06:00
Sven Schliesing
f62cc1e351 Fix link in documentation
c(dest) -> c(path)
2014-03-06 13:16:29 +01:00
Michael DeHaan
6c43e0e010 Simplify file module parameter description. 2014-02-28 13:55:07 -05:00
Richard C Isaacson
f17e549ff9 Typo fix. 2014-02-28 11:02:58 -06:00
Richard C Isaacson
809b714bfc 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
cca7fd3c0c 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
7b6c7366d1 Minor cleanup. 2014-02-28 10:04:05 -06:00
Richard C Isaacson
890202e4c0 copy module: cleanup and if directory_mode not set default to umask 2014-02-28 10:00:54 -06:00
Richard C Isaacson
cf4a6b39cc 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
32a2636dc7 Add expanduser calls on src/dest in the module too 2014-02-26 15:19:45 -06:00
James Cammarata
e659d55d62 Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel 2014-02-26 12:28:26 -06:00
Brian Coca
53d71a3949 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
3b2d409906 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
f03d6a67c8 Adding new tests for assemble role 2014-02-24 14:27:23 -06:00
James Cammarata
2157880029 Adding the backup destination to the resut dictionary for lineinfile 2014-02-20 13:31:54 -05:00
muffl0n
b0f00cc097 already call expanduser in action_plugin 2014-02-19 21:41:57 +01:00
Michael DeHaan
30611eaac5 Merge pull request #6036 from mxxcon/patch-1
docs_pull_request: Add parameters highlighting
2014-02-18 13:58:44 -05:00
James Cammarata
9c9a940af6 Merge branch 'fix-5679' of https://github.com/jirutka/ansible into jirutka-fix-5679 2014-02-17 14:54:29 -06:00
mxxcon
4e4be3edc0 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
56befa9468 Document ansible_managed changing the template. 2014-02-15 14:13:42 -05:00
Michael DeHaan
6f9ca7cfa5 Some minor docs corrections. 2014-02-15 14:05:42 -05:00
Richard C Isaacson
598b9c6b7c Cleanup per notes.
Some small changes to per notes from @mpdehann.
2014-02-12 10:01:10 -06:00
Richard C Isaacson
cb7c2b7524 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
e6c9705058 Merge remote-tracking branch 'pib/unarchive_remote' into pull_5136 2014-02-11 22:55:34 -06:00
Mike Grozak
f386e137fe 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
d3b544e842 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