cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10072 commits 47 branches 390 tags 440 MiB
Commit graph

3991 commits

Author SHA1 Message Date
Michael DeHaan
09259cbd77 Merge pull request #6671 from dermute/svr4pkg-G 
svr4pkg supports the -G switch for pkgadd
 2014-03-28 11:42:46 -04:00
Michael DeHaan
0e8c7b1c03 Scrub choices=BOOLEANS from remaining core module references. Correct form in argument_spec is type='dict'. 2014-03-28 11:41:35 -04:00
Michael DeHaan
3312099e70 Merge branch 'ec2_snapshot' of git://github.com/hkariti/ansible into devel 2014-03-28 11:36:31 -04:00
Michael DeHaan
7519e33787 Merge pull request #6730 from sivel/rax-cbs-new 
New modules: rax_cbs and rax_cbs_attachments
 2014-03-28 11:28:46 -04:00
Michael DeHaan
344bbf3eea Merge pull request #6419 from willthames/aws-autoscaling-with-token-and-profile 
Improvements to ec2 autoscaling modules
 2014-03-28 11:26:53 -04:00
Michael DeHaan
e21f61d604 Merge pull request #6616 from willthames/ec2_vol_allow_delete 
Allow state=absent for ec2_vol
 2014-03-28 11:24:37 -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
Joshua Conner
7a6c60b437 docker: use type instead of manually casting strings to lists 2014-03-28 11:19:48 -04:00
Joshua Conner
7bba229838 docker bugfixes: trim whitespace around list param elements, handle list params being coerced to int or long type 2014-03-28 11:19:13 -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
Michael DeHaan
0bec29a626 Merge pull request #6524 from tyll/update_rc_d_disable 
service module: Properly disable Debian services
 2014-03-28 11:10:46 -04:00
Michael DeHaan
2a656b2cf4 Merge branch 'devel' of https://github.com/drewblas/ansible into devel 2014-03-28 11:07:40 -04:00
Michael DeHaan
df3bb70797 Merge pull request #6630 from bigl0af/devel 
Modified library/system/user so that password change date is set on Sola...
 2014-03-28 10:57:59 -04:00
Michael J. Schultz
9fbef265bf Add Amazon SNS notification plugin 
- Supports a default message or a special message for any of SNS's
protocols (email, sqs, sms, http, https)
  - http://docs.aws.amazon.com/sns/latest/dg/PublishTopic.html
 2014-03-28 08:28:37 -05:00
Michael DeHaan
3b285d736c Merge pull request #6296 from jdauphant/devel 
Add linux module parameters for the modprobe module
 2014-03-27 17:12:21 -04:00
Cristian Ciupitu
96ff1444f0 Micro-optimization: replace s.find(x)==0 with s.startswith(x) 
timeit shows a speedup of ~1.4x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
 2014-03-27 20:35:20 +02:00
Cristian Ciupitu
1eaf85b89f 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-27 20:35:20 +02:00
Matt Martz
bb86443528 Implement recommendations from #4864 2014-03-27 12:59:08 -05:00
Ahti Kitsik
4d55f86f95 Fixed ufw module doc tags, it's reset everywhere, not reseted. 2014-03-27 17:22:39 +02:00
Michael DeHaan
cf434df6a4 Merge pull request #6707 from sivel/rax-extra-args 
rax module: Support arbitrary extra args
 2014-03-26 17:50:25 -04:00
Christopher H. Laco
972a27b14e Add Rackspace Cloud Block Storage modules 
- Add rax_cbs to create/delete cloud block storage volumes
- Add rax_cbs_attachments to attach/detach volumes from servers
 2014-03-26 14:42:22 -05:00
James Cammarata
e09313120c Make async jid's unique per host 
The jid will now also contain the PID of the async_wrapper process,
and can each unique jid from each host is tracked rather than just
relying on one global jid per task.

Fixes #5582
 2014-03-26 13:48:47 -05:00
Matt Martz
e093b216ff Support arbitrary extra args in rax module 
Add extra_create_args and extra_client_args to rax module to support passing
advanced configuration options to client instantiation and server create calls.
 2014-03-26 12:50:44 -05:00
Jeff Geerling
8960cba4a3 Fixed template validation docs and example. 2014-03-26 12:42:15 -05:00
Hagai
436b59252c Added wait_timeout option 2014-03-26 16:18:25 +02:00
Hagai
c900254ed0 ec2_snapshot: Add wait' and snapshot_tags' parameters, return more 
info on success
 2014-03-26 16:18:25 +02: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
Alexander Winkler
69e09b048c version_added for the new parameters documentation 2014-03-26 10:25:42 +00:00
James Cammarata
19c92b3a42 Merge branch 'subversion_export' of https://github.com/maniaplanet/ansible into maniaplanet-subversion_export 2014-03-25 21:25:50 -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
Alexander Winkler
03040a97c8 svr4pkg supports the -G switch for pkgadd 2014-03-25 09:03:48 +00: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
James Cammarata
a4af31e511 Revert "add yum module downgrade support" 
This reverts commit cbd1da6457.
 2014-03-24 12:27:32 -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
bryan hunt
aa2d6e47f0 Accept status code from a list of valid codes. 
(cast the list of acceptable codes to a list of int )
 2014-03-24 14:23:18 +00:00
bryan hunt
9ff6c40ed0 Accept status code from a list of valid codes. 2014-03-24 14:17:36 +00:00
bryan hunt
5d51837921 Accept status code from a list of valid codes. 2014-03-24 13:51:44 +00:00
Seth Woodworth
c28d3545fb adds missing ' to debconf examples 2014-03-23 18:52:08 -04:00
Michael DeHaan
503327d53c Merge pull request #6640 from falloutdurham/ec2_count 
ec2: Adding type int for count (in line with other cloud modules)
 2014-03-23 16:24:11 -04:00
Michael DeHaan
ebc9ca9504 Merge pull request #6635 from pilou-/debconf 
Fix ValueError when selection contains a colon
 2014-03-23 16:19:54 -04:00
James Cammarata
3ea5d573aa Acclerate improvements 
* Added capability to support multiple keys, so clients from different
  machines can connect to a single daemon instance
* Any activity on the daemon will cause the timeout to extend, so that the
  daemon must be idle for the full number of minutes before it will auto-
  shutdown
* Various other small fixes to remove some redundancy

Fixes #5171
 2014-03-23 14:45:49 -05:00
Ian Pointer
bebb11afeb Adding type int for count (in line with other cloud modules) 2014-03-23 13:51:54 -04:00
Pierre-Louis Bonicoli
1bb5b0f6bd Fix ValueError when selection contains a colon 2014-03-23 03:35:10 +01:00
Max Riveiro
9114fd6d7a
Add rollbar_deployment module 
Signed-off-by: Max Riveiro <kavu13@gmail.com>
 2014-03-23 00:38:53 +04:00
David Fox
6b0ef5f10e Modified library/system/user so that password change date is set on Solaris when updating password 2014-03-22 15:12:56 -04:00
Brent Langston
ca14df4790 Make the default URI a constant 2014-03-22 13:56:49 -04:00
Brent Langston
712e114dff Allow custom hipchat urls 2014-03-21 23:22:05 -04:00
Colin Mattson
3e6bf9640c Clarify documentation for apt pkg, state, install_recommends 2014-03-21 13:52:36 -07:00
Michael DeHaan
50aa3f6a09 Fix documentation for twilio module. 2014-03-21 14:26:20 -04:00
willthames
c0ac615a07 Allow state=absent for ec2_vol 
Add methods to the module to make it more readable and allow reuse
 2014-03-21 22:10:55 +10:00
Maykel Moya
6a92d48b0f ec2_group: Document group_desc rule param 2014-03-21 08:35:25 +01:00
willthames
7272877df6 Allow npm to install to a directory that doesn't yet exist 
If path is specified but does not exist, create it.
Fail if path is specified but is not a directory
 2014-03-21 13:30:12 +10: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
Michael DeHaan
c729bf209c Update documentation YAML syntax. 2014-03-20 13:22:19 -04:00
Maykel Moya
a429ff26dc ec2_group: Add documentation for rules_egress 2014-03-20 17:24:22 +01:00
Maykel Moya
b642e39e67 ec2_group: rules are not a required task argument 2014-03-20 17:24:22 +01:00
Maykel Moya
3156df9931 ec2_group: Request a fresh group object after creation 
When a group is created, an egress_rule ALLOW ALL to 0.0.0.0/0 is added
automatically but it's not reflected in the object returned by the AWS API
call. After creation we re-read the group for getting an updated object.
 2014-03-20 17:24:22 +01:00
Maykel Moya
649fcd3e1c ec2_group: Auto create missing groups referenced in rules 
Suppose a pair of groups, A and B, depending on each other. One solution
for breaking the circular dependency at playbook level:

    - declare group A without dependencies
    - declare group B depending on A
    - declare group A depending on B

This patch breaks the dependency at module level. Whenever a depended-on
group is missing it's first created. This approach requires only two tasks:

    - declare group A depending on B (group B will be auto created)
    - declare group B depending on A

When creating a group EC2 requires you to pass the group description. In
order to fullfil this, rules now accept the `group_desc` param. Note
that group description can't be changed once the group is created so
it's nice to keep descriptions in sync.

Concrete example:

- ec2_group:
    name: mysql-client
    description: MySQL Client
    rules_egress:
      - proto: tcp
        from_port: 3306
        to_port: 3306
        group_name: mysql-server
        group_desc: MySQL Server

- ec2_group:
    name: mysql-server
    description: MySQL Server
    rules:
      - proto: tcp
        from_port: 3306
        to_port: 3306
        group_name: mysql-client
 2014-03-20 17:24:17 +01:00
Maykel Moya
77d7165dde ec2_group: Deduplicate rule parsing/validation code 2014-03-20 16:19:35 +01:00
Maykel Moya
f97243d6ed ec2_group: Add support for handling egress rules 2014-03-20 15:50:08 +01:00
jjshoe
1f980b6880 assign_public_ip was actually added in 1.5 
Checked 1.4.5 and this option doesn't exist. Will check/update/pull docs next.
 2014-03-20 09:21:10 -05: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
Michael DeHaan
2156e87e62 Update cpanm 2014-03-20 08:10:02 -04: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
Till Maas
c21fa8ebee service module: Properly disable Debian services 
Services on Debian need to be disabled with 'disable' instead of 'remove'
to avoid them being enabled again when 'update-rc.d $service defaults' is run,
e.g. as part of a postinst script.
 2014-03-20 09:19:42 +01:00
Till Maas
65deb7f50f authorized_key: Be more specific about manage_dir 
- Explain which properties are managed when manage_dir is True.
 2014-03-20 09:15:59 +01:00
Michael DeHaan
991399edf0 Update comments about redis config. 2014-03-19 18:15:52 -04:00
Michael DeHaan
b0639b16cf Merge branch 'devel' of git://github.com/mleventi/ansible into devel 2014-03-19 18:15:06 -04:00
Michael DeHaan
a8514dacc3 Add capabilities module. 2014-03-19 17:48:17 -04:00
nate@bx.psu.edu
97db1676e0 Bugfix for xattrless files and the capabilities module. 2014-03-19 17:48:17 -04:00
nate@bx.psu.edu
f26ebff438 Create a capabilities module for managing Linux kernel capabilities(7) with setcap(8). 2014-03-19 17:48:17 -04:00
Michael DeHaan
266123e521 Merge pull request #6549 from mattjbray/docker-tty-stdin_open-params 
docker: add tty and stdin_open options
 2014-03-19 17:28:12 -04:00
Michael DeHaan
a5bdf621cf add notes about new AWS modules. 2014-03-19 17:26:59 -04:00
Michael DeHaan
5a5a9574e6 Merge pull request #6540 from Zeekin/devel 
Add cloud modules ec2_scaling_policy and ec2_metricalarm
 2014-03-19 17:25:44 -04:00
Michael DeHaan
b1fe7ee24a Add notes about new notification module. 2014-03-19 17:23:30 -04:00
Michael DeHaan
3d7bf1e52a Merge branch 'devel' of git://github.com/tksmd/ansible into devel 2014-03-19 17:23:01 -04:00
Michael DeHaan
54635cb59f Add note about IRC library default change. 2014-03-19 17:21:41 -04:00
Michael DeHaan
8fb5e2c657 Merge pull request #5443 from nirvinehh/devel 
irc module: Make default irc color none; add color none
 2014-03-19 17:20:07 -04:00
James Tanner
5f428041db Fixes #6582 Re-add regex to ignore untracked files that were never tracked 2014-03-19 15:42:40 -04:00
James Cammarata
efcf93f280 Merge pull request #6571 from bcoca/file_fixes_copydir 
fixed issue with directory permissions on copy
 2014-03-19 13:54:12 -05:00
James Tanner
67517e96d3 Fixes #6567 put the git wrapper script in the module temp dir 2014-03-19 10:30:10 -04:00
Brian Coca
f6a75ebaf1 fixed issue with directory permissions on copy #6552 2014-03-18 22:29:22 -04:00
James Tanner
324a943e12 Fixes #6548 correct issues from rhn_register refactoring 2014-03-18 21:21:18 -04:00
Michael DeHaan
8899c74aaf Merge pull request #6565 from fabianfreyer/devel 
Fixed bug that occurred when pkgsite not specified
 2014-03-18 17:13:05 -04:00
Michael DeHaan
9cf75ed3a6 Merge pull request #6564 from joehack3r/devel 
Update example to include delete on termination
 2014-03-18 17:12:29 -04:00
Michael DeHaan
c7b683e26e Merge pull request #6561 from patrickheeney/slack-url-fix 
Fix domain name in slack module
 2014-03-18 17:11:29 -04:00
Fabian Freyer
17fcc89b3b Fixed bug that occurred when pkgsite not specified 2014-03-18 21:55:05 +01:00
joehack3r
815115f792 Update example to include delete on termination 2014-03-18 15:49:27 -05:00
James Tanner
f6a02d9b2c Merge pull request #6220 from trevorah/ansible.git 
apt_repository: autoinstall python-apt if not available
 2014-03-18 16:21:04 -04:00
patrickheeney
f594e8b6f0 Fix domain name in slack module 2014-03-18 11:17:20 -07:00
James Cammarata
acdb75da92 Merge branch 'threatgrid-issues/6341' into devel 2014-03-18 12:37:54 -05:00
Michael DeHaan
416d6becd9 Merge pull request #6544 from ramondelafuente/feature/notification-slack 
A module for notifications through the Slack.com platform
 2014-03-18 13:29:48 -04:00
Michael DeHaan
d8254c14d4 Merge pull request #6556 from andreaskern/patch-1 
add param to note example for ssh-keyscan
 2014-03-18 13:25:45 -04:00
James Cammarata
0556c53f78 Execute commands through accelerate with shell when needed 
This fixes an issue related to the new run_command changes, whereby
Popen fails to run a command when an executable is specified + shell=False
and there are multiple positional arguments (see Popen docs for details)
 2014-03-18 12:24:13 -05:00
Michael DeHaan
d686a23b69 Merge pull request #6554 from vyrak/keep-head-state 
homebrew: state=head includes --HEAD
 2014-03-18 12:58:01 -04:00
andreaskern
a57581e1e7 add param to note example for ssh-keyscan 
hostnames in the known hosts file are typically stored as Hashed values, calling 'ssh-keyscan' with '-H' changes to output to the Hashed format so that the known_hosts file looks more consistent
 2014-03-18 17:24:56 +01:00
James Cammarata
bc38bfe61b Merge branch 'issues/6341' of https://github.com/threatgrid/ansible into threatgrid-issues/6341 2014-03-18 10:46:39 -05:00
James Tanner
cf0a0ca3d2 Fixes #6519 Properly handle state=absent in sysctl module 2014-03-18 09:30:21 -04:00
Matt Bray
79b3efc989 docker: add tty and stdin_open options 
Useful for development environments.  Setting these options to true
allows you to `docker attach` to a docker container started with
ansible.
 2014-03-18 11:57:01 +00:00
Ramon de la Fuente
f51872885c mandatory silly mistake 2014-03-18 04:59:15 +01:00
Ramon de la Fuente
b4cd4ad15b A module for notifications through the Slack.com platform 
This module can send messages through Slack.com, and supports all options
available in the "incoming webhook integration".

- text
- channel
- username
- icon_url / icon_emoji
- link_names
- parse
 2014-03-18 04:46:08 +01:00
Zeekin
5e8641b834 Added AWS modules ec2_scaling_policy and ec2_metricalarm for configuring scaling policies for autoscaling groups, and metric alarms. 2014-03-18 10:32:55 +10:00
vyrak bunleang
f5289deee7 prevent state from changing from head to installed 
allows for --HEAD to be included in brew install command
 2014-03-17 16:56:54 -06:00
Michael DeHaan
23990b94c9 Merge pull request #6529 from sivel/apt-repository-no-pycurl 
Remove dependency on pycurl in apt_repository
 2014-03-17 17:32:23 -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
Matt Martz
7af8a33def remove dependency on pycurl from apt_repository by using module_utils/urls.py instead 2014-03-17 11:31:04 -05:00
Michael DeHaan
caa0b02962 Update formatting in module example. 2014-03-17 09:10:33 -04:00
Zeekin
dae519b723 Improvements to ec2 autoscaling modules 
* Added desired_capacity and vpc_zone_identifier to ec2_asg
* Use ec2_argument_spec() method and then remove unnecessary
  declarations from argument_spec
* Remove AWS_REGIONS declaration
* Rename block_device_mappings to volumes to be consistent with ec2
* Remove all pep8 warnings except line length and continuation indent
* Use updated module_utils/ec2.py to add profile and security_token
  support
* Remove mandatory arguments for delete to make launchconfig deletion
  work
* Handle existing launch configurations better
* Improve output information
* Improve documentation
 2014-03-17 11:33:43 +10:00
Jonathan Dray
0981488df7 fix: bug in apt when python-apt is not present apt-get was not called due to unsafe call 2014-03-17 02:24:12 +01:00
Michael DeHaan
47aff528b9 Amend wait_for docs to reference version of feature addition. 2014-03-16 17:10:37 -04:00
Michael DeHaan
de57057cae Merge branch 'devel' of git://github.com/AnderEnder/ansible into devel 2014-03-16 17:10:02 -04:00
Michael DeHaan
b471d84e52 Version bump for alternatives module, changelog. 2014-03-16 16:54:57 -04:00
Gabe Mulley
1cae0a6801 add a module for update-alternatives 2014-03-16 16:54:57 -04:00
Michael DeHaan
aaaf9dbc43 Merge pull request #5597 from laggyluke/mongodb_user_idempotence 
Fix idempotence in mongodb_user module
 2014-03-16 15:50:43 -05:00
Michael DeHaan
e4fcc434d1 Version bump, bigip_facts + changelog 2014-03-16 16:48:41 -04:00
Michael DeHaan
51f90c1712 Bump twilio module version_added, changelog. 2014-03-16 16:48:41 -04:00
Matthew Makai
2215111ec5 adding twilio module for sending text notifications in build process 2014-03-16 16:48:41 -04:00
Matthew Makai
8420211aee new module to send text message notifications 2014-03-16 16:47:49 -04:00
Matt Hite
42d6fc2b54 New bigip_facts module 2014-03-16 16:47:49 -04:00
Michael DeHaan
69d26d507b Merge pull request #5758 from drawks/devel 
Correct sleep calls
 2014-03-16 15:40:28 -05:00
Michael DeHaan
16ca4c2195 Update version_added 2014-03-16 16:35:52 -04:00
Drew Stokes
5aba903dcf add registry option to npm module 2014-03-16 16:35:52 -04:00
Michael DeHaan
0bc3cec1c8 Merge pull request #6062 from jpmens/mqttpaho 
module update: mqtt notification now uses Paho as mosquitto.py being deprecated
 2014-03-16 15:21:34 -05:00
Michael DeHaan
11dd81c724 Merge pull request #6069 from danieljaouen/homebrew_class 
Update homebrew module.
 2014-03-16 15:21:00 -05:00
Michael DeHaan
855ccb62c0 Update cask version, changelog. 2014-03-16 16:18:27 -04:00
Michael DeHaan
03f93e0f79 Merge branch 'homebrew_cask' of git://github.com/danieljaouen/ansible into devel 2014-03-16 16:18:05 -04:00
Michael DeHaan
1a90890fd0 Update tap version, changelog 2014-03-16 16:17:11 -04:00
Daniel Jaouen
e7787607d0 Add homebrew_tap module. 2014-03-16 16:17:11 -04:00
Michael DeHaan
9cc5ae6f2f Merge pull request #6120 from lalinsky/apt_repository_pycurl_non_ppa 
Don't require pycurl in apt_repository when it's not actually needed
 2014-03-16 15:15:57 -05:00
Michael DeHaan
f700da8249 Bump version_added field on composer module. 2014-03-16 16:12:02 -04:00
Michael DeHaan
b0dbc61d63 Move facts to 'module_utils' so they can be referenced by other modules. Note unlike other module_utils/ dirs this keeps the original 
license -- so usage of facts code in modules will be limited to GPLv3 modules.
 2014-03-16 16:12:02 -04:00
dmtrs
0e06e8bb7f Add module composer (php dependency manager) 2014-03-16 16:12:02 -04:00
Michael DeHaan
d3e989435b Merge pull request #6405 from fabianfreyer/devel 
Add support for new pkgng repository format and annotations
 2014-03-16 14:43:56 -05:00
Michael DeHaan
8116fecf5d Merge pull request #6512 from tarka/jira-module-pr 
Add a JIRA control module for Ansible.
 2014-03-16 14:34:38 -05:00
Michael DeHaan
33a1f65565 Merge pull request #6375 from sivel/nexmo 
New module: nexmo
 2014-03-16 14:34:18 -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
Michael DeHaan
eef5a8a847 Update setup module signature from merge commit. 2014-03-16 14:11:43 -04: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
Michael DeHaan
eaef86d22b Merge pull request #6355 from hkariti/npm_install_invalid 
Add a package to missing list if npm list reported it as invalid
 2014-03-16 12:41:03 -05:00
Michael DeHaan
92f9f50f1a Merge pull request #6339 from threatgrid/systemd-template-svc-fix 
systemd template services must not discard template part
 2014-03-16 12:40:44 -05:00
Michael DeHaan
8d3e2fe79a Merge pull request #6323 from aresch/rpm_key_query_fix 
Fix rpm_key on system with no gpg keys imported
 2014-03-16 12:40:11 -05:00
Michael DeHaan
1211160cdb Merge pull request #6289 from rawtaz/fix-irc-nicklen 
Make irc module accept the nick being shortened by the server.
 2014-03-16 12:39:48 -05:00
Michael DeHaan
2b2b174fd3 Merge conflict. 2014-03-16 13:36:52 -04:00
Michael DeHaan
0939a83174 Merge pull request #6203 from garetharmstronghp/fix_rpm_key_issue_5621 
Fix issue #5621, rpm_key doesn't work for el5
 2014-03-16 12:32:28 -05:00
Michael DeHaan
8a07d98f4b Merge pull request #6175 from AdmiralNemo/fix-filesystem 
filesystem: Ignore blkid cache
 2014-03-16 12:31:53 -05:00
Michael DeHaan
8920990d63 Merge pull request #6097 from mattjeffery/bug/modprobe_normalise_name 
Normalise the module name when comparing against the module names in /proc/modules
 2014-03-16 12:31:17 -05:00
Michael DeHaan
5aef2f0687 Merge pull request #6005 from pgehres/chkconfig 
Adding better failure output for chkconfig failures
 2014-03-16 12:27:46 -05:00