Commit graph

882 commits

Author SHA1 Message Date
Dag Wieers
eb36ff45b9 Make script module use raw module so it does not require python 2012-12-24 00:24:34 +01:00
Michael DeHaan
3d3deb9797 Merge pull request #1795 from dagwieers/raw-enhanced
Add return code and error output to raw module
2012-12-23 09:34:57 -08:00
Dag Wieers
988db558b3 Add return code and error output to raw module
Since we use 'raw' heavily on equipment where 'command' and 'shell' are not (yet) working (and python may need to be installed first using raw) these improvements are necessary in order to write more complex scripts (with return code handling and separated stdout/stderr).

This change includes the following changes:

 - exec_command() now returns the return code of the command
 - _low_level_exec_command() now returns a dict, including 'rc', 'stdout' and 'stderr'
 - all users of the above interfaces have been improved to make use of the above changes
 - all connection plugins have been modified to return rc and stderr
 - fix the newline problem (stdout and stderr would have excess newlines)

In a future commit I intend to add assertions or error handling code to verify the return code in those places where it wasn't done. Since only the output was available, the return code was ignored, even though we expect them to be 0.
2012-12-23 18:04:54 +01:00
Jan-Piet Mens
85e0017a85 fix cron DOCUMENTATION 2012-12-23 14:08:26 +01:00
jkleint
d732b25828 Clarify that lineinfile uses Python regexes. 2012-12-20 11:41:45 -05:00
Daniel Hokka Zakrisson
eb57c9c430 Indicate the reboot option was added in 1.0
Fixes #1787.
2012-12-19 18:45:33 +01:00
Michael DeHaan
6fc6c37401 Merge pull request #1785 from TutoringAustralasia/devel
Add support for @reboot to cron module
2012-12-19 04:46:27 -08:00
Chelsea Robb
96e2805b31 Change check for date/time parts being set 2012-12-19 15:12:04 +11:00
Chelsea Robb
6a02e3d918 Added error message when reboot and extra params are passed, and added better boolean parsing on reboot 2012-12-19 13:11:58 +11:00
Chelsea Robb
fc4ac70342 Add support for @reboot to cron module 2012-12-19 09:32:51 +11:00
Gregory Duchatelet
29f985aa2e do not conditionalize this for older Python, fix indentation, better use
of hash iteration.
2012-12-17 21:07:36 +01:00
Gregory Duchatelet
e64de2ff88 Bugfix: in hosts with python-2.5, hash keys needs flatten string. 2012-12-17 13:46:50 +01:00
Daniel Hokka Zakrisson
d4b1874d44 Merge pull request #1773 from jpmens/scriptdoc
fix and clarify 'script' docs
2012-12-15 09:28:50 -08:00
Jan-Piet Mens
4f8abd981a fix and clarify 'script' docs 2012-12-14 10:59:48 +01:00
Stephen Fromm
ccca5fcd1c Ensure files created by authorized_key have correct selinux context
Three changes:
* Add set_default_selinux_context() to module_common that sets
  a file's context according to the defaults in the policy
* In atomic_replace(), set the default context for the file if
  selinux is enabled and the destination file does not exist.
* In authorized_key, set the default context when creating
  $HOME/.ssh and $HOME/.ssh/authorized_keys.  If these already
  exist, this won't touch them.
2012-12-13 16:35:49 -08:00
Michael DeHaan
f2893b6418 Merge pull request #1746 from njharman/subversion
Subverion module improvements
2012-12-13 04:34:19 -08:00
Michael DeHaan
5d31e8d1fc Merge pull request #1752 from jpmens/mail2
mail module: add MIME attachments, port and addresses with phrases
2012-12-13 04:31:01 -08:00
Norman J. Harman Jr
ddc0507f65 Passing in module instead of just fail_json per upstream request. 2012-12-12 16:55:30 -06:00
Michael DeHaan
ea5d79a712 Merge pull request #1755 from lorin/patch-1
Fix ppa syntax in apt_repository module doc
2012-12-12 14:47:10 -08:00
Norman J. Harman Jr
19b84d0527 pip module improvements
- Do not silently ignore malformed pip requirements files.
- Properly reports changed when removing packages.
- "latest" i.e. --upgrade is *not* incompatible with requirements files.
- Less branchy, simpler logic.
- Removed pointless variable "initializations", Python doesn't need that.
  Other code simplifications.
- Fun fact; pip install is (kind of) case insensitive, pip freeze is not.
  So, 'sqlalchemy' will be reported as installed by install, but missing
  by freeze.

The perhaps controversial change and the one that led to finding /
fixing above issues...

Instead of adding command parameters 'index', and 'find', and 'mirrors',
and etc.  Added 'extra_args' which are passed onto pip.

The use case for --index-url is having a private pypi repo, like
http://pypi.python.org/pypi/localshop, to which you publish private
packages.  I'm sure most every pip option has a use case for someone.
extra_args handles all those. Can reserve ansible command parameters for
the most common.

Tested with pip 1.1.
2012-12-12 15:40:25 -06:00
Seth Vidal
165861dd2f if user has manually installed an intermediate version - don't ignore it: issue 1754 2012-12-12 11:52:35 -05:00
Jan-Piet Mens
f9755ca36d mail module: add MIME attachments, port and addresses with phrases
Add HTML-escaping to code examples in rST tempate of module-formatter
 Add support for specifying port, addresses with phrases and attaching files
 Add support for custom headers and document version_added for new options
 X-Mailer header added :)
 protect empty address lists & attachment list, and add bcc
2012-12-12 07:42:42 +01:00
Lorin Hochstein
f8821fa3d9 Fix ppa syntax in apt_repository module doc
The example for using a ppa had the wrong syntax.

Ironically, the correct syntax is illustrated in a comment on line 23.
2012-12-11 23:01:36 -05:00
Norman J. Harman Jr
2e6999dab9 Subverion module improvements
- Added username, password arguments.
  - Documented existing revision argument.
  - Corrected documentation/docstrings; removed git references, use svn
    nomenclature, etc.
  - Refactored duplicate code, redundant shell calls, filter abuse,
    inconsistent formating, etc.
  - Shell quoting so it doesn't break for one guy who has spaces in
    pathnames.
  - svn called with '--non-interactive' and '--no-auth-cache'.
2012-12-10 20:34:26 -06:00
Michael DeHaan
637883164e Merge pull request #1720 from bladypirat/devel
added support for scheduling downtime for all services on host
2012-12-07 08:00:15 -08:00
Alexandre Bourget
0b9cbcb270 supervisorctl: document the 'present' option 2012-12-06 13:33:00 -05:00
Dag Wieers
ac2f396379 Fix "NameError: global name 'name' is not defined" exception 2012-12-05 18:48:43 +01:00
Daniel Hokka Zakrisson
11b64314df Select all fields from the user, as some of them are version-dependent 2012-12-05 09:51:40 +01:00
Stephen Fromm
1bcfdd94f3 Further refine remote branch tracking in b1ec6e8
Move operations that are dependant on a remote branch under a if
is_remote_branch() conditional.  While at it, remove assignment to cmd
string in same block that wasn't used when calling _run().
2012-12-04 17:02:54 -08:00
Stephen Fromm
b1ec6e8163 Fix git module to update branch to latest when using version=<branch>
The git module would not pull in updates to a branch when
version=<branch>.  This updates that block to checkout the branch
and then do a git reset --hard <remote>/<branch>.  This
should now track updates to a branch.
2012-12-04 11:40:48 -08:00
Piotr Kweclich
9c20eb089b added support for scheduling downtime for all services on host 2012-12-03 22:40:27 +01:00
Stephen Fromm
5b7c8fcc38 Further tweak how to find pip in virtualenv on centos/redhat/fedora
In a virtualenv, pip is called just pip.  This fixes the pip module to
search for the virtualenv pip first before trying the pip-python and
python-pip variants.  Without this, pip module would not install to the
virtualenv when that parameter is provided.
2012-12-02 08:13:10 -08:00
Stephen Fromm
e33e02950d Make use of mirrors in pip module configurable with use_mirrors option
Older versions of pip (anything less than 1.0?) do not support
--use-mirrors flag.  This makes it configurable.  Default is yes.
2012-12-02 08:04:27 -08:00
Daniel Hokka Zakrisson
d5a456fbcf Merge pull request #1697 from bcoca/mint
Implements multiple interpreter overrides
2012-12-02 05:28:28 -08:00
Stephen Fromm
d277953a53 Fix pip module to check if requirements already installed
This updates _is_package_installed() to accept a requirements file
as an argument.  This is used later in main() to check if python libs
specified in a requirements file are already installed.  I updated
main() to consolidate the handling of install/uninstall in a single
block.  This should help if someone wants to remove packages specified
by a requirements file.
2012-12-01 20:00:21 -08:00
Igor Galić
1ba5c5ae97 : doesn't work in this documentation. 2012-11-28 10:36:22 +01:00
Igor Galić
e031054934 Fix subversion module's documentation
Let our users determine what they want to do with a given module.
Particularily when the mdoule doesn't pose any such restrictions.
2012-11-28 10:02:20 +01:00
Brian Coca
8ef2807305 removed env as per project policy
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2012-11-27 11:18:46 -05:00
Jan-Piet Mens
910f1c042e ini_file: prohibit section name 'default'
allow update of default section
add blurb re template to create base file
2012-11-27 13:21:48 +01:00
Patrik Lundin
d4af9e4c5c Use shlex for rc.conf parsing.
This makes the line parsing a lot more robust (and easier to read).
Code supplied by @dhozac, thanks!

Remove re import because this is not used anywhere.
2012-11-25 13:09:54 +01:00
Patrik Lundin
fde00327b0 Rework "enabled" implementation for FreeBSD.
When trying to perform enabled=yes followed by enabled=no
against FreeBSD the module would die with the following error:
TypeError: sub() takes at most 4 arguments (5 given)

The target FreeBSD client (8.2) is running python 2.6.6. It seems the
extra 'flags' argument was added to re.sub() in 2.7.

In fixing this issue I have attempted to create a general atomic method
for modifying a rc.conf file. Hopefully this will make it easier to add
other rc based platorms. The strip/split magic was inspired by the user
module.
2012-11-25 13:09:54 +01:00
Daniel Hokka Zakrisson
4679d8d6e5 Remove references to non-existant variable rc 2012-11-25 00:23:29 +01:00
Daniel Hokka Zakrisson
1ec2a59073 Merge pull request #1676 from dagwieers/service-action-fix
The vars stop/start were intended as strings
2012-11-24 15:16:30 -08:00
Dag Wieers
18b797f096 The vars stop/start were intended as strings
This is a typo that was reported on IRC, because of this people got: "NameError: global name 'stop' is not defined".
2012-11-25 00:13:53 +01:00
Ton Kersten
7bba04b176 Corrected for fallthrough 2012-11-24 16:26:15 +01:00
Ton Kersten
ee4fe9ff55 Added pip-python to the search for CentOS 6 compatibility 2012-11-24 13:36:32 +01:00
Michael DeHaan
ac09b47ec4 Merge pull request #1668 from eest/refactor_service_module
Repost: Refactor service module to use subclasses like user module.
2012-11-23 13:19:09 -08:00
Patrik Lundin
5b7aa494b2 Refactor module to use subclasses like user module.
* Basically the moving parts from the original service module arranged in
  subclasses.
* General structure and helper methods comes from the user module.
* Less forgiving to unsupported platforms: it requires a subclass per platform.
  (This makes it easier to work on one platform without having to think about.
  what other platform might be affected in unexpected ways).
* Now has basic OpenBSD support.
* Solaris support needs to be added.

Thanks to @dhozac for general advice and Linux testing.
Thanks to @bcoca for clearing up some FreeBSD questions.
2012-11-23 21:03:17 +01:00
Michael DeHaan
ce487a8544 Merge pull request #1658 from jpmens/docs_2
module_formatter: re-instate code
2012-11-23 07:58:48 -08:00
Michael DeHaan
3981c72957 Streamline code 2012-11-23 10:58:17 -05:00