Commit graph

3360 commits

Author SHA1 Message Date
Michael DeHaan
cfcdc3403e Use task names in examples. 2013-12-26 13:46:09 -05:00
Michael DeHaan
4765032fcb Merge branch 'devel' of git://github.com/beefsalad/ansible into devel 2013-12-26 13:41:42 -05:00
Michael DeHaan
1260225fc9 Merge pull request #5427 from bcoca/template_docs2
added more usefull example for jinja2 overrides
2013-12-26 10:30:44 -08:00
beefsalad
5b2fda6fa6 added descriptions for yum options
Updated main description to state that the yum module will handle package groups.  Added descriptions for each example, as it is unclear to (some) users that @Name implies a group install.
2013-12-26 12:25:52 -06:00
Brian Coca
488ef22f5e added more usefull example for jinja2 overrides (this one is actually
used)

Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-12-26 12:01:41 -05:00
lichesser
b49cb2e540 Partial fix for #4565. Works only for Debian 7 and later 2013-12-26 17:53:17 +01:00
Maykel Moya
0711447d3a Missing "is" in file module description 2013-12-26 12:34:46 +01:00
Michael DeHaan
e8d9f58949 Merge pull request #5419 from stoned/shell-module-doc-fix
shell module: document removes option and sync with command module doc
2013-12-25 10:52:46 -08:00
Michael DeHaan
0bdf615612 User report of DO not taking underscores so tweaking docs 2013-12-25 13:51:56 -05:00
Michael DeHaan
aa8beadec3 Fix a documentation item. 2013-12-25 13:50:15 -05:00
Stoned Elipot
b85743e228 shell module: document removes option and sync with command module doc 2013-12-25 12:12:11 +01:00
Will Thames
b65486734a rds module: add snapshot capabilities
Add the ability to create snapshots and restore from them
Make instance creation, deletion, restore, and snapshotting idempotent
(really helps testing a playbook if you can run it multiple times)
2013-12-24 20:32:49 +10:00
David Hummel
c5433d9742 Check for group_name and cidr_ip. 2013-12-23 15:57:47 -05:00
Jasper N. Brouwer
a52ca73167 Swapped conditions of the changed if statements 2013-12-23 09:54:16 +01:00
Janitha Karunaratne
fd037f5960 Fixes #5381 easy_install bug when used with virtualenv 2013-12-20 16:44:18 -06:00
David Hummel
bd67c6756a Add rule group_name parameter whose value can reference containing group name. 2013-12-20 16:06:55 -05:00
Brian Coca
b45fb649ee now handles default and allaows for either shorthand entry or specific
fields per entry section

the default option works both when added to entry or as stand alone.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-12-19 20:36:49 -05:00
Peter Salvatore
12cb1afdc8 fix typo in synchronize module 2013-12-18 13:06:35 -08:00
Michael Vermaes
5671ddcdd3 Attempt #2 to cause yum to fail on invalid url 2013-12-19 00:40:44 +08:00
Michael DeHaan
3f81c3c416 Merge pull request #5162 from JensRantil/fix-corrupt-module-outputs
More don't catch `SystemExit`
2013-12-18 05:13:34 -08:00
willthames
46a5f8c656 Make state=present the default for ec2_tag
Using `ec2_tag` module without the state argument
currently results in:
```
failed: [127.0.0.1] => {"failed": true, "parsed": false}
```
This fix makes `state=present` the default
2013-12-18 13:40:41 +10:00
jctanner
d3f94fe606 Merge pull request #5303 from mohangk/rds_postgres
Adds postgres support for Ansible RDS module
2013-12-17 14:56:21 -08:00
Serge van Ginderachter
ad6ffe00d0 bigip_monitor_http: two small bug fixes
- extra properties were not set at creation, only when updating
  which can be overlooked when running the module from more than 1 node...
- fix bas var as time_until_up didn't get used
2013-12-17 23:08:06 +01:00
jctanner
320d41149a Merge pull request #5289 from rstrox/devel
rax: import novaclient.exceptions for cs.images.find
2013-12-17 14:04:05 -08:00
jctanner
4209b8a953 Merge pull request #5203 from sivel/irc-rfc-loops
Improve IRC module. Fixes #5186
2013-12-17 11:46:17 -08:00
Roger López
a3dcac0a0f django_manage need not require virtualenv in PATH
The virtualenv parameter to the django_manage command is used to locate
the virtualenv and build it if necessary.  Access to the virtualenv
executable is only needed if the virtualenv directory doesn't exist and
needs to be built.  This patch allows for the situation where a
virtualenv that is not in the PATH was used to create a virtualenv prior
to running the django_manage module.
2013-12-17 14:45:42 -05:00
Brad P. Crochet
47f995ef64 Specify internal_network_name
This allow one to specify a specific internal network name for the case
where there is more than one nic on an instance. Without this, the list
of ports may not return the correct order. Therefore, it is necessary
to specify the exact internal network to attach the floating ip to
2013-12-17 14:24:30 -05:00
Brad P. Crochet
ab52efc7fb Add support for neutronclient
The quantum_* modules will now try neutronclient first, and fall back
to quantumclient. If that fails, error out.

The code now references neutron instead of quantum in all internal
cases.
2013-12-17 13:24:20 -05:00
jctanner
93c15a41dc Merge pull request #5274 from veeti/easy_install_chdir
Fix permission error when using easy_install through sudo
2013-12-17 10:11:31 -08:00
willthames
12005a1cd0 Move more responsibility to common EC2 module
Moved `AWS_REGIONS` into `ec2` module
Created `ec2_connect` method in `ec2` module
Updated modules able to use `ec2_connect` and `AWS_REGIONS`
2013-12-17 14:07:24 +10:00
jctanner
53a3671df4 Merge pull request #5160 from JensRantil/fix-issue-5159
Fixes #5159 `file` module: Don't catch `SystemExit`
2013-12-16 12:17:33 -08:00
jctanner
7182486fd2 Merge pull request #5099 from tartansandal/postgresql_db_check_mode
postgres_db CHECKMODE changed status
2013-12-16 11:39:16 -08:00
Aleksey Ovcharenko
dcf0fdb9e2 Added version_added 2013-12-16 19:20:02 +02:00
Troy C
038d030404 catch exposed cs.exceptions instead of novaclient 2013-12-16 09:33:29 -06:00
Mohan Krishnan
1dd2510e76 Adds postgres support for Ansible RDS module 2013-12-16 15:51:41 +08:00
Matt Martz
925eb1dca7 Don't import novaclient, exceptions are available via cs.exceptions 2013-12-13 19:34:46 -06:00
Matt Martz
b3744800fb Utilize ansible.module_utils.rax 2013-12-13 19:34:46 -06:00
Matt Martz
017c9d07d2 Initial commit of rax_keypair 2013-12-13 19:34:45 -06:00
Troy C
3007a8af7e import novaclient.exceptions for cs.images.find
cs.images.find(human_id= throws novaclient.exceptions.NotFound,
resulting in the try/except block with
image = cs.images.find(name=image)  being skipped. catching
novaclient.exception.NotFound allows images to be specified with the
human readable name.

Example:
  tasks:
    - name: Server build request
      local_action:
        module: rax
        region: DFW
        image: Ubuntu 12.04 LTS (Precise Pangolin)

Also, the import is placed after try: import pyrax, because pyrax
imports novaclient and should fail if novaclient is missing.
2013-12-13 16:27:21 -06:00
Jens Rantil
1b6019f6e0 module(file): Fail instead of exit on exception 2013-12-13 21:34:19 +01:00
Jens Rantil
f4aa808b8d module(file): state what went wrong on exception 2013-12-13 21:33:19 +01:00
jctanner
91f903eabe Merge pull request #4886 from sergeyhush/devel
fix when the system does not have lsb_release script, but has /etc/lsb_release file
2013-12-13 11:25:45 -08:00
James Tanner
f55270e746 Set version_added for new_instance_name in cloud/rds module 2013-12-13 13:54:08 -05:00
jctanner
b9cb49e638 Merge pull request #4872 from timurbatyrshin/4869-old-python-apt-fix
#4869 compatibility with older versions of apt
2013-12-13 10:43:47 -08:00
jctanner
66cad764d2 Merge pull request #5028 from retr0h/correct-nova-api-auth-check
Nova doesn't attempt to auth on obj instantiation
2013-12-13 08:36:27 -08:00
Mike Grozak
ed7c9a1fbb Added to the file module the functionality to force conversion hard link and symlink when the force attribute is set to 'yes' 2013-12-13 17:10:50 +01:00
jctanner
53c5b1d934 Merge pull request #4949 from eest/openbsd_pkg-rework-name-parsing
openbsd_pkg: rework package name parsing.
2013-12-13 08:05:25 -08:00
Vincent Viallet
db37528fd2 Bumped to v1.5 2013-12-13 08:59:52 +08:00
jctanner
dc41912158 Merge pull request #5213 from dalevizo/devel
Add get_dmi_facts in setup for FreeBSD systems using dmidecode
2013-12-12 15:32:59 -08:00
jctanner
6051ee0df5 Merge pull request #5052 from bpennypacker/promote_rename
cloud/rds module: added promote command & updated modify command to allow for renaming of database instances.
2013-12-12 15:15:34 -08:00
James Tanner
35cd043e25 Addresses #5276 update documentation for ec2_ami no_reboot parameter 2013-12-12 18:03:00 -05:00
evan82
01e8390a8f Fix ec2_ami no_reboot setting (currently it will not reboot instances to create the AMI)
Line 276: no_reboot = dict(default=True, type="bool"),

This should really default to False (When AMIs are created the machine will reboot before copying the disk).

"When enabled, Amazon EC2 does not shut down the instance before creating the image. When this option is used, file system integrity on the created image cannot be guaranteed."
2013-12-12 15:49:24 -07:00
jctanner
1688a7c776 Merge pull request #5231 from jeffnappi/patch-1
Corrected documentation in ec2_ami module - no_reboot defaults to yes
2013-12-12 14:18:14 -08:00
Nicholas DeClario
b2ea24bc08 Added ability to start and stop existing EC2 instances. 2013-12-12 17:16:59 -05:00
Veeti Paananen
fa90f31cc8 Fix permission error when using easy_install through sudo
Same as b2542bff72.
2013-12-13 00:13:13 +02:00
Jim Dalton
aa329b4b48 Make sure initial_state is initialized 2013-12-12 13:09:40 -08:00
Matt Martz
27fb55519c Add version_added for vip_id 2013-12-12 09:32:06 -06:00
Matt Martz
6c6dd09e23 Add ability to specify a VirtualIP ID for sharing a VIP with another LB 2013-12-12 09:32:06 -06:00
drewlll2ll
54a28eb45b Added prev_state for directory 2013-12-12 09:44:29 -05:00
Vincent Viallet
30820437bb Minor typos and remove extra dependencies. 2013-12-12 12:30:22 +08:00
Vincent Viallet
1150b78bb0 Add ec2_key module. 2013-12-12 12:23:58 +08:00
Jim Dalton
ac1e84d976 Account for instances that have not yet been registered. Fixes #5076 2013-12-09 19:38:03 -08:00
Michael DeHaan
5cd97e8cf6 Merge pull request #5222 from resmo/fix/apt-update
apt: update index before trying to autoinstall python-apt
2013-12-09 18:32:25 -08:00
Jeffrey Nappi
2b82f7d75f Corrected documentation in ec2_ami module - no_reboot defaults to yes 2013-12-09 18:57:58 -07:00
Rene Moser
2d805ae5da apt: update index before trying to autoinstall python-apt 2013-12-09 10:21:27 +01:00
Dimos Alevizos
8c73aa13e4 Minor changes to simplify code 2013-12-08 09:02:50 +02:00
David Hummel
cc3678730c Fix issue #5214: hostname persistence on RedHat/CentOS 2013-12-07 21:10:42 -05:00
Dimos Alevizos
de4e4c54b9 Add get_dmi_facts in setup for FreeBSD systems using dmidecode 2013-12-07 17:16:20 +02:00
Matt Martz
ccf4199ac8 Initial commit of rax_dns_record 2013-12-06 17:03:08 -06:00
Matt Martz
afd55934fc Remove errant raise 2013-12-06 16:49:28 -06:00
Matt Martz
7b3aa5c205 Add state attribute to description 2013-12-06 16:10:00 -06:00
Matt Martz
c5f54a94f8 Initial commit of rax_dns module 2013-12-06 13:13:09 -06:00
Matt Martz
ead733362f module is not exposed to send_msg, but main() catches exceptions and uses module.fail_json 2013-12-06 11:42:30 -06:00
Matt Martz
b48b22b24a Try to follow RFC2812 for waiting on serverl welcome and join messages before performing more tasks 2013-12-06 11:42:30 -06:00
jeromew
1916e8ec90 user module: force= and remove= should not be mutually exclusive 2013-12-05 17:07:24 -05:00
jctanner
5e336d7caf Merge pull request #5075 from gservat/patch-1
Added support for parsing in the SLES patch level correctly
2013-12-05 13:34:57 -08:00
gservat
db2f41bdcb This change is meant to replace distribution_release, not version! 2013-12-06 07:53:39 +11:00
gservat
83f35a63dd Oops... fixed an error 2013-12-06 07:49:03 +11:00
jctanner
6b45c4a6ca Merge pull request #5181 from mvo5/bugfix/apt-fnmatch-remove
add fnmatch() support for apt remove too (just like install)
2013-12-05 09:18:04 -08:00
jctanner
54a43d8cea Merge pull request #5174 from jinnko/devel
Add documentation for usage of encrypted postgresql passwords.
2013-12-05 09:07:57 -08:00
Jinn Koriech
6f2843724d Fix postgresql_user documentation render 2013-12-05 16:57:56 +00:00
Michael Scherer
3df62f1d8a Fix apt module to be able to install package by giving just a provides and not the full name
The apt module check if a packag eis valid by loking in the cache, checking only for
full name, while it should also check that the name is not just provided.
Fix https://github.com/ansible/ansible/issues/5177
2013-12-05 17:56:54 +01:00
Michael Vogt
559de5c65e add fnmatch() support for apt remove too (just like install) 2013-12-05 17:54:43 +01:00
jctanner
85d8587cc0 Merge pull request #5173 from zitterbacke/devel
basic AIX network facts
2013-12-05 08:40:48 -08:00
David Hummel
614efadb7a Fix issue #5043: ec2_vpc module wait=yes state attribute retrieval 2013-12-05 10:47:22 -05:00
Jinn Koriech
6b54417bd5 Add documentation for usage of encrypted postgresql passwords. 2013-12-05 10:35:35 +00:00
Alfons Zitterbacke
5390ee9763 added AIX network facts 2013-12-05 10:13:55 +01:00
Alfons Zitterbacke
cc783b3e1b added AIX network facts 2013-12-05 10:06:44 +01:00
James Tanner
cbfeb0a2ea Fixes #5169 Evaluate check_mode in the user module SunOS class 2013-12-05 00:44:55 -05:00
Michael DeHaan
71a5de6e72 Merge pull request #5168 from sivel/rax_clb_required_together
rax_required_together is a function
2013-12-04 19:11:58 -08:00
Matt Martz
d73251c342 rax_required_together is a function 2013-12-04 19:26:34 -06:00
Jasper N. Brouwer
0e11e4c86f Fixed false positive on initctl as enable_cmd
Also on update-rc.d
In service module
2013-12-04 21:49:00 +01:00
Bruce Pennypacker
d3480c5630 fixed documentation & added rename example 2013-12-04 10:01:30 -05:00
Jens Rantil
153df0a23e module(nagios): don't catch SystemExit
If we do this, we risk outputting two JSON payloads, which will be
unparsable.
2013-12-04 13:57:55 +01:00
Jens Rantil
8f2580fc98 module(apt_key): don't catch SystemExit
If we do this, we risk outputting two JSON payloads, which will be
unparsable.
2013-12-04 13:57:50 +01:00
Jens Rantil
705316e303 file module: Don't catch SystemExit
This fixes issue #5159.
2013-12-04 13:13:49 +01:00
Michael DeHaan
27199dc219 Merge pull request #5133 from joshuaconner/add_docker_max_version_to_docs
add supported docker version to docs
2013-12-03 16:46:34 -08:00
Michael DeHaan
dc4a09a588 Merge pull request #5143 from evgkrsk/ovirt-import
Use ovirtsdk if it installed, but fall out gracefully if it is not
2013-12-03 16:27:54 -08:00
jctanner
2670529671 Merge pull request #5090 from dragon3/hostname_support_amazon_linux
hostname module: add support for Amazon Linux
2013-12-03 12:34:55 -08:00
James Tanner
d227614529 Fixes #5109 synchronize module ssh port
Added a parameter for dest_port and also check ansible_ssh_port inventory variable.
2013-12-03 14:48:20 -05:00
Evgenii Terechkov
b5d8aa9ff1 Use ovirtsdk if it installed, but fall out gracefully if it is not 2013-12-03 20:21:16 +08:00
Kamil Kisiel
2300902784 Don't modify hgrc when running purge 2013-12-02 23:50:33 -08:00
Paul Bonser
5626efba7e Optionally unarchive a file already on the remote machine 2013-12-02 19:51:10 -06:00
jctanner
c259993559 Merge pull request #5078 from brandonhilkert/fix-ec2-tags
Fix checking for existence of EC2 tags
2013-12-02 14:50:47 -08:00
jctanner
872a1ee39b Merge pull request #5107 from maetthu/devel
authorized_key module: rewrite options to dict parser, fixes #5032
2013-12-02 14:02:43 -08:00
jctanner
ef92b2cb12 Merge pull request #5063 from samh/devel
Fixed hostname module for RHEL6 Workstation
2013-12-02 13:38:32 -08:00
Joshua Conner
c2f128f737 add supported docker version to docs 2013-12-02 13:08:47 -08:00
James Tanner
ad837709bd Addresses #5023 Fix import comments 2013-12-02 15:13:49 -05:00
James Tanner
6000d636b3 Fixes #5023 Convert all modules to use new snippet import pattern 2013-12-02 15:11:23 -05:00
jctanner
93159cb9cd Merge pull request #4996 from sivel/rax-module-utils
Implement ansible.module_utils.rax
2013-12-02 11:55:59 -08:00
jctanner
219f27a594 Merge pull request #4938 from giorgio-v/pkgin_y_default
Added `-y` flag to `query_package`
2013-12-02 11:47:04 -08:00
James Tanner
c050872458 Fixes #4796 handle unicodedecode errors from dmidecode output 2013-12-02 11:56:38 -05:00
James Tanner
04b031756c Merge pull request #4502 from dxsarmit/ansible
New library/cloud/ec2 module parameter (assign_public_ip) for non-default VPC instance launching.
2013-12-02 09:43:20 -05:00
Aleksey Ovcharenko
bcd7af3991 Fixed a typo. 2013-12-02 16:35:44 +02:00
Michael DeHaan
5efcf265d1 Merge pull request #5046 from JensRantil/improve-mount-doc
mention that the mount module will remove mount directories
2013-12-01 14:27:40 -08:00
Matthias Blaser
9d442243ab rewrite options to dict parser, fixes #5032 2013-11-30 09:03:35 +01:00
Kahlil (Kal) Hodgson
ab14ec840b postgres_db CHECKMODE changed status
Make the changed status for postgres_db under CHECKMODE match the
status that would be returned normally.
2013-11-29 11:29:03 +11:00
Michael DeHaan
36effd237c There's a cleaner way to do this, commit to module formatter pending.
Revert "No longer need to reference 'version_added' in docs for these, as this was quite a while ago."

This reverts commit ff0a41d446.
2013-11-27 21:23:03 -05:00
Michael DeHaan
ff0a41d446 No longer need to reference 'version_added' in docs for these, as this was quite a while ago. 2013-11-27 21:19:32 -05:00
dragon3
d39e6fda92 hostname module: add support for Amazon Linux 2013-11-28 09:31:25 +09:00
Brandon Hilkert
33afaebb95 Fix checking for existence of EC2 tags 2013-11-27 11:01:42 -05:00
James Cammarata
30948ae0dc Fix accelerate module parameter for IPv6 activation 2013-11-27 09:32:07 -06:00
jctanner
696ce0effe Merge pull request #5067 from justinludwig/fix-aws-credential-params
Fix AWS credential params for ec2_ami, ec2_elb, ec2_tag, ec2_vpc, route53, and s3 modules
2013-11-27 07:14:19 -08:00
gservat
13da2c3ac9 Added support for parsing in the SLES patch level correctly
On SLES, the setup module was returning the architecture as the distribution version (i.e. platform.dist() didn't quite return the right thing). This change checks for /etc/SuSE-release and grabs the second column in the third line as distribution_version.
2013-11-27 23:44:34 +11:00
Jim Rybarski
483bb58f2d fixed documentation typo about region purpose 2013-11-27 00:35:33 -06:00
Justin Ludwig
26374d89a0 Fix AWS credential params for s3 and other modules
The `ec2_ami`, `ec2_elb`, `ec2_tag`, `ec2_vpc`, `route53`, and `s3` modules
all canonicalize the AWS access and secret key params as
`aws_access_key` and `aws_secret_key`. However, following the fixes for #4540,
those modules now use `get_ec2_creds` from `lib/ansible/module_utils/ec2.py`,
which requires access/secret key params to be canonicalized as
`ec2_access_key` and `ec2_secret_key`. As a result, AWS credentials passed
to those six modules as parameters are ignored (they instead always use
the AWS credentials specified via environment variables, or nothing).

So this change fixes those six modules to canonicalize the
AWS access and secret key params as `ec2_access_key` and `ec2_secret_key`,
allowing them to again accept AWS credentials passed via module params.
2013-11-26 19:29:06 -08:00
Sam Hartsfield
ae7735b45d Fixed hostname module for RHEL6 Workstation 2013-11-26 11:36:10 -05:00
James Tanner
7be13faae8 Fix comment yaml escaping in authorized_key module 2013-11-26 08:54:19 -05:00
James Tanner
4ba51eef6f Save comment hashes in sshkeys 2013-11-25 23:46:48 -05:00
James Tanner
16b22d0d64 Cleanup debug statements 2013-11-25 22:16:04 -05:00
James Tanner
b938554311 Fixes #5032 escape and safely split key options in authorized_keys module 2013-11-25 22:13:42 -05:00
Josh Kuhn
b1a6bc6e7f Added note about .rsync-filter files, with example 2013-11-25 15:12:58 -05:00
James Tanner
d187066339 Fixes #5010 Add user to all defined supplementary groups 2013-11-25 14:56:46 -05:00
Bruce Pennypacker
9abca424ea Added promote command to promote read-replicas to standalone databases (http://aws.amazon.com/about-aws/whats-new/2012/10/11/amazon-rds-mysql-rr-promotion/). Added ability for the modify command to rename a database instance via the optional new_instance_name parameter 2013-11-25 13:16:41 -05:00
Josh Kuhn
517e4af2cf Added -FF flag to rsync invocation in synchronize
The `-FF` option causes rsync to look for files in the source directory named `.rsync-filter` and uses them to filter directories underneath them. If no `.rsync-filter` files are found, the behavior is identical to the command run without the -FF option. This flag does not sync the .rsync-filter files themselves.

This change should be backwards compatible and not produce surprising behavior for users, since they are unlikely to create `.rsync-filter` files unintentionally.
2013-11-25 12:27:58 -05:00
greenbrian
d80eb4a7fd Update unarchive
Modified argument order provided to unzip command as the -o was being interpreted as a file.
2013-11-25 10:44:39 -06:00
Michael DeHaan
41e83d9df1 Merge pull request #5045 from junegunn/wait_for-python2.4
Remove Python 2.4-incompatible 'with' statement
2013-11-25 08:28:14 -08:00
James Tanner
5c1fbcc9d2 Addresses #5036 fix typo in git module 2013-11-25 09:55:05 -05:00
James Tanner
d950a3d1b5 Fixes 5036 add missing parameter to git module function call 2013-11-25 09:51:07 -05:00
Jens Rantil
883f37e404 Improved documentation of mount module
Mentioning the fact that mount point directories are created and
removed.
2013-11-25 13:58:00 +01:00
Junegunn Choi
9c798b119c Remove Python 2.4-incompatible 'with' statement 2013-11-25 17:01:24 +09:00
John Dewey
15613de6f5 Nova doesn't attempt to auth on obj instantiation
Need to call nova.authenticate() to validate credentials.
2013-11-22 21:57:02 -08:00
Aleksey Ovcharenko
2814828bc9 Added existing_only options to skip creating new files on receiver 2013-11-22 23:59:57 +02:00
James Tanner
32986c4d64 Fixes #5021 safely split hostkeys with quotes 2013-11-22 16:36:31 -05:00
Michael DeHaan
e54a574bb2 Merge pull request #5020 from damycra/django_manage_migrate_changed_filter
Reports changed status from django_manage migrate
2013-11-22 13:22:07 -08:00
Steven Davidson
f5d9679abc Reports changed status from django_manage migrate 2013-11-22 19:35:19 +00:00
jctanner
815b32685b Merge pull request #4985 from zakkie/devel
fix typo in document
2013-11-22 09:25:44 -08:00
Michael Scherer
9731f388c1 Do not use construct not compatible with python 2.4, fix #5006 2013-11-22 16:06:41 +01:00
Michael DeHaan
e0b0a89231 Merge pull request #4998 from berenddeboer/portinstall-fix
When name has digits in it, we may incorrectly determine package is already installed
2013-11-21 16:00:11 -08:00
Joshua Lund
02adc1fdcf Fixed a typo in the 'unarchive' module documentation 2013-11-21 16:22:20 -07:00
Berend de Boer
2222532745 Don't use pkg_glob when guessing name, else we may think the package
is installed when it isn't.
2013-11-22 11:13:21 +13:00
Matt Martz
3f2cbb7583 Add ansible.module_utils.rax 2013-11-21 15:46:25 -06:00
Akihiro YAMAZAKI
97b6e13e46 fix typo in document 2013-11-21 16:09:43 +09:00
John Dewey
64f7f6726d Handled string/dict the ansible way 2013-11-20 20:21:04 -08:00
John Dewey
c372007b49 The setting of params via dict or string by tags
Updated per @mpdehaan suggestions.
* Rather than passing in JSON, supply the policy options as a hash
  or string.
* Bumped version_added to 1.5.
2013-11-20 17:07:08 -08:00
James Tanner
35dc7d235c Fix pep8 E701 errors in bigip_monitor_http 2013-11-20 14:57:30 -05:00
jctanner
d9f75ad284 Merge pull request #4621 from sergevanginderachter/bigip_monitor
Introduce Big-IP F5 http monitor module
2013-11-20 11:53:35 -08:00
Matt Thompson
8cd465938b Add missing exception name 2013-11-20 16:58:19 +00:00
Bruce Pennypacker
a694c0c44c use new airbrake API URL 2013-11-20 16:52:15 +00:00
Michael DeHaan
82a9387532 Merge pull request #4971 from erjohnso/devel
fixes #4954 plus updates for gcutil/v1beta16 tests
2013-11-19 14:54:32 -08:00
Eric Johnson
8ff58eb46e fixes #4954 plus updates for gcutil/v1beta16 tests 2013-11-19 22:30:22 +00:00
James Tanner
9727a4415c Add warning comment to rhn_register module about fixing pep8 errors 2013-11-19 16:41:51 -05:00
James Tanner
1d24bcc916 Fix pep8 error in hostname module 2013-11-19 16:39:48 -05:00
James Tanner
cc2fdb9d83 Fix pep8 errors in bigip_monitor_tcp 2013-11-19 16:38:16 -05:00
James Tanner
e81c976636 Fix pep8 errors in unarchive module 2013-11-19 16:35:06 -05:00
James Tanner
52032b80d4 Fix pep8 error in ec2_vpc 2013-11-19 16:31:25 -05:00
James Cammarata
bfb1d469e6 Checking for a transitional running state in supervisorctl
Fixes #3977
2013-11-19 14:54:20 -06:00
jctanner
2855684538 Merge pull request #4780 from mscherer/fix_accelerate_various
Fix various warning on accelerate module, found by pyflakes
2013-11-19 12:42:32 -08:00
jctanner
8277bf29d2 Merge pull request #4898 from stoned/homebrew-install_options-fix
Fix homebrew module's install_options handling
2013-11-19 12:30:32 -08:00
John Dewey
d3b1d06af7 Cleaned up docs just a smidge
Mostly added periods where missed, and corrected /vhost spacing.
2013-11-19 12:00:09 -08:00
Michael DeHaan
6d3fc34458 Merge pull request #4968 from jsmartin/no_parameters_needed
cloudformation parameters no longer required.
2013-11-19 11:43:46 -08:00
Michael DeHaan
5e0c6e0af3 Merge pull request #4868 from hnakamur/rhel5_hostname_fix
hostname module fix for RHEL5
2013-11-19 11:38:29 -08:00
Michael DeHaan
afcda172e1 Merge pull request #4934 from mscherer/fix_urpmi_2
return failed if a package couldn't be installed
2013-11-19 11:35:51 -08:00
James Martin
592124f129 cloudformation parameters no longer required. 2013-11-19 14:17:23 -05:00
Michael DeHaan
b29669dccd Remove the 'host' module for now because the alias handling involves a bit too much automagic. Proposal is to come up with a spec
of how it should work and accept to spec, using the existing patch (cherry-picked) as a baseline.
2013-11-19 14:12:45 -05:00
John Dewey
37773f967e Added module to handle rabbit policies [1]
Used quite a bit of the existing rabbit modules provied by @chrishoffman.

[1] https://www.rabbitmq.com/parameters.html
2013-11-19 00:36:21 -08:00
Michael DeHaan
f7c3975f21 Add version_added to all modules missing version_added information, the docs formatter will now
raise errors when omitted, updated changelog with new modules.
2013-11-18 18:55:49 -05:00
Michael DeHaan
2726b13245 Changelog updates and a few module renames. vpc -> ec2_vpc, githooks -> github_hooks, blacklist -> kernel_blacklist. These are all new in 1.4 so safe to change. 2013-11-18 18:28:21 -05:00
Michael DeHaan
aee1fcad05 Update changelog, rename vpc module to ec2_vpc. 2013-11-18 17:59:40 -05:00
Sergey Sudakovich
4d0f374dbf compatible with python 2.4 2013-11-18 11:33:04 -08:00
Patrik Lundin
e66add13d5 openbsd_pkg: rework package name parsing.
Give the module more knowledge of the package name structure.
This makes the handling of version-less flavors (like vim--no_x11)
behave properly.

While here sprinkle debug logging that is helpful when testing the
module.
2013-11-18 20:24:10 +01:00
James Tanner
0ce1123693 Fixes #4851 Set syslog debug mode for accelerate properly 2013-11-18 09:56:12 -05:00
giorgio-v
0342f432e2 Added -y flag to query_package
* library/packaging/pkgin:

Signed-off-by: giorgio-v <giorgio@refactor.it>
2013-11-18 08:01:10 +01:00
James Tanner
99dfa1afec Revert "Merge pull request #4912 from zehome/openbsd_pkg_flavourfix"
This reverts commit de2f4cf04d, reversing
changes made to 2c33737bfa.
2013-11-18 00:15:33 -05:00
Michael Scherer
d66027ba7a return failed if a package couldn't be installed
For some reason, on my test mandriva, urpmi --force return 0
even when it cannot install a rpm. So we have to explicitely check
if the package was properly installed with a loop
2013-11-18 00:22:54 +01:00
Michael Scherer
0d8b81cd95 optionally use rpm python module instead of calling a
external executable, to avoid the cost of forking.
Since python-rpm is not automatically present, we still fallback
on the slower rpm fork method.
2013-11-17 15:37:30 +01:00
Michael Scherer
9482815b71 Fix behavior of urpmi module where it always return "changed"
even when a package is already installed, since urpmi will
always return 0 wether it install or not.
2013-11-17 15:37:30 +01:00
Tom Berger
8a39e0a615 Update cloud/docker: if the image name containes a repository, strip it.
When using repositories other than the main one at docker.io, the image name contains the repo name (which itself contains ":" as a separator between domain and port). We don't really care about it here, so just get rid of it before looking at the image name.
2013-11-16 23:15:03 +02:00
Michael DeHaan
56e3d31253 Merge pull request #4904 from joemaller/npm-outdated-fix
update npm-module to handle new node.js output
2013-11-16 10:40:51 -08:00
Matt Martz
1ef49405b3 Remove debug print statement 2013-11-15 19:52:10 -06:00
jctanner
7ebda819b5 Merge pull request #4919 from sivel/4577-rax-refactor
Refactor rax module. Fixes #4577
2013-11-15 12:20:13 -08:00
jctanner
59ef9c3bea Merge pull request #4918 from sivel/rax-facts
Add rax_facts module for retrieving facts about a Cloud Server
2013-11-15 12:13:37 -08:00
jctanner
c057fe2f5f Merge pull request #4861 from pmakowski/devel
urpmi module
2013-11-15 11:59:23 -08:00
James Tanner
876e503417 Fix docstring in bigip_monitor_tcp module 2013-11-15 14:44:53 -05:00
jctanner
f61babd0ee Merge pull request #4849 from zimbatm/notify_grove
Adds a grove notifier module
2013-11-15 11:15:08 -08:00
jctanner
45ad8237a6 Merge pull request #4832 from matze/add-zypper-repository
Add zypper_repository module
2013-11-15 11:13:50 -08:00
jctanner
ce080e0fb4 Merge pull request #4813 from sergevanginderachter/bigip_tcpmonitor
Introduce Big-IP F5 tcp monitor module
2013-11-15 11:10:52 -08:00
jctanner
dc5b952854 Merge pull request #4910 from matze/add-system-blacklist-module
Add system module to blacklist kernel modules
2013-11-15 11:06:05 -08:00
jctanner
912d43a37d Merge pull request #4913 from arkadijs/devel
Use pkgng glob (-g) feature to allow installation of packages by wildcard
2013-11-15 11:00:49 -08:00
jctanner
f90df824c3 Merge pull request #4914 from resmo/fix/module-host
host: bug fixes and improvments
2013-11-15 10:49:50 -08:00
Matt Martz
234a78673b Refactor rax module 2013-11-15 12:25:21 -06:00
Matt Martz
fa4e55d677 follow suit with the rax refactor and split out the slugify code 2013-11-15 12:00:32 -06:00
James Tanner
af0cdd464c Clean up erroneous lineinfile.orig file 2013-11-15 12:17:17 -05:00
Matt Martz
545aabaddc Add rax_facts module for retrieving facts about a Cloud Server 2013-11-15 11:12:48 -06:00
jctanner
de2f4cf04d Merge pull request #4912 from zehome/openbsd_pkg_flavourfix
OpenBSD packages can be installed using 'flavour'
2013-11-15 07:21:37 -08:00
James Tanner
2c33737bfa Fix docstring and remove redundant parameter value in portinstall module 2013-11-15 10:13:19 -05:00
Rene Moser
0c70e898cc host: fix bug, alias was not removed 2013-11-15 14:04:41 +01:00
Rene Moser
6da2d55007 host: removed unused self_has_aliases 2013-11-15 14:04:40 +01:00
Rene Moser
a61f46f4f0 host: skip lines beginning with new line 2013-11-15 14:04:40 +01:00
Rene Moser
ca5e5cfebc host: fix changed is not available on fail 2013-11-15 14:04:40 +01:00
Arkadi Shishlov
78f5c69a88 Use pkgng glob (-g) feature to allow installation of packages by wildcard.
Also solves the particular problem of installing packages that have multiple versions in the repo, but specifying the exact version would be troublesome:

$ pkg install -n dovecot
The following 2 packages will be installed:

	Installing dovecot: 1.2.17
	Reinstalling dovecot-2.2.6 (options changed)

$ pkg install -n dovecot-2.2.6
The following 1 packages will be installed:

	Reinstalling dovecot-2.2.6 (options changed)

$ pkg install -n -g dovecot-2*
The following 1 packages will be installed:

	Reinstalling dovecot-2.2.6 (options changed)
2013-11-15 13:28:14 +02:00
Laurent Coustet
12e7e3b2f6 OpenBSD packages can be installed using 'flavour'. Best example
is vim. It can be installed as vim--no_x11 or vim--gtk2.
2013-11-15 12:20:30 +01:00
Matthias Vogelgesang
e5ef5e29ec Add system module to blacklist kernel module 2013-11-15 10:34:55 +01:00
Berend de Boer
46b11774c1 Support to install software on FreeBSD using portinstall. 2013-11-15 19:49:04 +13:00
jctanner
b086b5571c Merge pull request #4888 from jarv/jarv/wait_for
Adding more wait conditions to the wait_for module
2013-11-14 12:52:00 -08:00
James Tanner
dfe6c5d434 Fix copyright section in githooks module 2013-11-14 14:49:10 -05:00
jctanner
ad5012f930 Merge pull request #4691 from cg-soft/git-bare-ref-repo-support
Add support for bare git reference repos
2013-11-14 10:39:57 -08:00
James Tanner
303e996035 Quote docstring in githooks module 2013-11-14 13:20:17 -05:00
jctanner
ce20cf8488 Merge pull request #4731 from pcgentry/devel
new githooks module
2013-11-14 10:17:39 -08:00
jctanner
3a5e689b80 Merge pull request #4785 from Tinche/get_url/uri-content-disposition
Modified the get_url module to respect the content-disposition header if...
2013-11-14 10:02:15 -08:00
James Tanner
15243cd801 Fix typo in postgresql_user module docstrings 2013-11-14 11:57:01 -05:00
jctanner
8041735c56 Merge pull request #4686 from bcoca/postgresql_user_pwds
postgresql_user now supports users w/o a password, encrypted passwords and expiration
2013-11-14 08:55:11 -08:00
jctanner
d14d20327a Merge pull request #4510 from jhoekx/jboss-module
Add jboss module
2013-11-14 08:26:56 -08:00
James Tanner
575d7eb8be Set required = True for src in unarchive module. 2013-11-14 10:59:24 -05:00
jctanner
be67a6f815 Merge pull request #4625 from pileofrogs/devel
unarchive module & action plugin
2013-11-14 07:57:57 -08:00
James Tanner
d96f469520 Merge pull request #4525 from ko-zu/ansible
Add a regexp parameter to assemble module to match or exclude filenames.
2013-11-14 10:30:12 -05:00
Joe Maller
d95ba87b62 update list_outdated module split to both old and new module delimiter. 2013-11-14 10:25:23 -05:00
jctanner
4707e3a472 Merge pull request #4895 from nextus/cron
Fix: absent state removing whole cron.d file instead of specific job
2013-11-14 05:30:00 -08:00
nextus
17cbbcdd30 Don't allow cron module to delete cron_file without name parameter assignment 2013-11-14 13:24:14 +04:00
James Tanner
8e41480059 Set required=false for answer_file in svr4pkg docstrings 2013-11-13 20:04:54 -05:00
jctanner
065f1edc89 Merge pull request #4420 from Jmainguy/devel
Added resp= option for svr4pkg to enable the -r option in pkgadd for res...
2013-11-13 17:02:58 -08:00
James Tanner
d3128e00c5 Fix parameter typo in swdepot module 2013-11-13 19:57:39 -05:00
jctanner
d32b33f191 Merge pull request #4398 from melodous/module_swdepot
Module swdepot
2013-11-13 16:56:16 -08:00
Stoned Elipot
47072bfb77 Fix homebrew module's install_options handling
...each given option must be a single element in the
arguments list passed as first argument to module.run_command()
2013-11-13 23:20:53 +01:00
James Tanner
33242cacf3 Merge pull request #4375 from pfalcon/ansible
copy: Implement recursive copying if src is a directory.
2013-11-13 15:52:40 -05:00
nextus
a43aaaecd0 Fix: absent state removing whole cron.d file instead of specific job 2013-11-13 23:58:37 +04:00
James Tanner
2fd56efb9e Fix typo in ejabberd_user module docstrings 2013-11-13 10:59:37 -05:00
jctanner
558d0b322a Merge pull request #4329 from privateip/devel
ejabberd_user module for managing users in ejabberd
2013-11-13 07:56:15 -08:00
James Tanner
7eadf78009 Merge pull request #4282 from cristobalrosa/ansible
Add a fact for checking if interface is in promiscuous mode.
2013-11-13 10:33:57 -05:00
James Tanner
d0986a20a3 Use shared ec2 module snippet in elasticache module 2013-11-13 10:24:08 -05:00
James Tanner
fd6b16aca8 Merge pull request #4313 from jsdalton/ansible
Add AWS ElastiCache module
2013-11-13 10:15:51 -05:00
James Tanner
a8c531a2f6 Merge branch 'add_aws_elasticache_module' of git://github.com/jsdalton/ansible into jsdalton-add_aws_elasticache_module 2013-11-13 10:10:40 -05:00
James Tanner
a5c29b886e Merge pull request #4299 from psvo/ansible
Fix check for ROLLBACK_COMPLETE in cloudformation module
2013-11-13 10:03:09 -05:00
James Tanner
f332bb0d7c Fixes #4891 Catch unicodedecode errors from python-apt 2013-11-13 09:48:56 -05:00
Philippe Makowski
4455fea579 Merge remote-tracking branch 'upstream/devel' into devel 2013-11-13 10:09:40 +01:00
John Jarvis
bf435e2032 Adding more wait conditions to the wait_for module
Adds a new option to wait_for to wait for a file to exist on the file
system before continuing, optionally takes a search_regex param to match
text in the file.
2013-11-12 19:04:38 -05:00
Sergey Sudakovich
24ea5949bb fix when the system does not have lsb_release script, but has /etc/lsb_release file 2013-11-12 15:25:39 -08:00
James Tanner
5a3032a950 Fixes #4884 Do not prematurely exit from file module if src not defined 2013-11-12 18:17:20 -05:00
jctanner
deb33e9d0e Merge pull request #4272 from psvo/tags_parameter_for_cloudformation
Add support for tags parameter to cloudformation module
2013-11-12 11:58:43 -08:00
jctanner
f0afb20ceb Merge pull request #4161 from stygstra/openvswitch-modules
Modules for managing Open vSwitch bridges and ports
2013-11-12 11:20:20 -08:00
James Tanner
0ecc83fe98 Change route53 module to use shared ec2 authorization module snippet 2013-11-12 14:16:30 -05:00
James Tanner
fb903c5317 Change s3 module to use shared ec2 authorization module snippet 2013-11-12 14:13:05 -05:00
James Tanner
06eb7357fd Remove redundant credential code in vpc module 2013-11-12 14:10:38 -05:00
James Tanner
8332a0b75e Change vpc module to use shared ec2 authorization moudle snippet 2013-11-12 14:09:06 -05:00
James Tanner
b37a8b90a6 Fix docstring quoting in vpc module 2013-11-12 14:02:50 -05:00
jctanner
7fdeed6539 Merge pull request #4141 from carsongee/vpc
Added module for handling AWS Virtual Private Clouds
2013-11-12 11:01:00 -08:00
James Tanner
e4c2517e89 Add default for remote_src to assemble dostrings to avoid confusion 2013-11-12 13:21:49 -05:00
jctanner
2cf335969f Merge pull request #4738 from bcoca/assemble_action_plugin
assemble can now use src from master/origin
2013-11-12 08:23:39 -08:00
James Tanner
710117e4da Addresses #4628 evaluate package check return properly and exit failure if not present 2013-11-12 10:37:27 -05:00
Philippe Makowski
a4ff61748d Merge remote-tracking branch 'upstream/devel' into devel 2013-11-12 15:12:59 +01:00
James Tanner
6008ea40ee Add more error detail to the service module for FreeBSD 2013-11-12 00:02:30 -05:00
James Tanner
aafe7f5b37 Fixes #4877 set type to bool for cache parameter in apt module 2013-11-11 23:23:56 -05:00
jctanner
c459347976 Merge pull request #4245 from abelbabel/patch-1
add check mode support to pkgng module
2013-11-11 20:19:21 -08:00
James Tanner
7502e15298 Address #4285 remove redundant stderr output in apt module 2013-11-11 22:27:47 -05:00
jctanner
9faaa2b98b Merge pull request #4285 from blair/apt-module-register-stdout-stderr
apt: pass child process stdout and stdout to m.fail_json() and m.exit_js...
2013-11-11 19:15:10 -08:00
jctanner
a28bcd60d9 Merge pull request #4617 from resmo/feature/python-apt
apt: autoinstall python-apt if apt or apt_pkg is not available
2013-11-11 18:50:43 -08:00
James Tanner
f820e8e719 Merge pull request #4286 from blair/ansible
apt: do not consider not-removed and not-upgraded packages as changes.
2013-11-11 21:39:07 -05:00
jctanner
ec55268738 Merge pull request #4304 from ferringb/fixes/cron-permissions
Enforce umask for cron module, so cron_file generated files are 0644.
2013-11-11 14:23:39 -08:00
Timur Batyrshin
9e7623e9de #4869 compatibility with older versions of apt 2013-11-11 16:56:05 +04:00
Michael DeHaan
0a34870b1f Merge pull request #4858 from sivel/rax-clb-serialize
Fix serialization error in rax_clb
2013-11-10 13:51:41 -08:00
Michael DeHaan
3e6369e026 Merge pull request #4862 from rob-szew/devel
Correcting the security group id lookup from the list of security group ...
2013-11-10 13:45:08 -08:00
Hiroaki Nakamura
63a552b2d3 Apply the same change as https://github.com/hnakamur/ansible-playbooks/pull/2 2013-11-10 08:28:33 +09:00
Tin Tvrtkovic
ea60360449 Use the final URL from the finished request instead of the provided URL for filename generation, to properly deal with redirects. 2013-11-09 00:35:14 +01:00
Rob Szewczyk
fe95745a20 Correcting the security group id lookup from the list of security group names 2013-11-08 17:46:41 -05:00
Philippe Makowski
38a2ee7751 urpmi module 2013-11-08 21:43:19 +01:00
James Laska
4013e94cf6 Correct documentation URLs 2013-11-08 15:02:45 -05:00
Matt Martz
a897bb389c Remove unused variable 2013-11-08 13:15:38 -06:00
Matt Martz
8f2f8a5b53 DRY up dict conversion and fix serialization error 2013-11-08 13:11:15 -06:00
James Tanner
36ca726258 Fixes #4522 Document that comments in ini files will be discarded with the ini module 2013-11-08 09:57:22 -05:00
Jonas Pfenniger
b963596e5c Adds a grove notifier module 2013-11-08 11:21:46 +00:00
James Tanner
fa62ee46bf Set the correct version added for the hostname module 2013-11-07 22:01:02 -05:00
jctanner
01a054d2be Merge pull request #3940 from hnakamur/hostname_module
Add a hostname module, which sets system's hostname.
2013-11-07 15:11:06 -08:00
James Tanner
934ec1c0b6 Addresses #4801 Update file module docs to indicate behavior for relative src paths 2013-11-07 17:02:34 -05:00
jctanner
bd9fb39634 Merge pull request #4801 from sspans/devel
Add support for relative symlinks
2013-11-07 13:57:18 -08:00
jctanner
8e8c8efc8f Merge pull request #4769 from alanfairless/more-password-entropy-revised
Revised patch for more password entropy
2013-11-07 13:39:05 -08:00
James Tanner
898de833b0 Merge pull request #4413 from jerm/ansible
Add capability to pass in a PATH prefix to run_command and allow pip module
to utilize that to make virtualenv bin/ available in pip installs
2013-11-07 15:51:27 -05:00
James Tanner
6cdc99286c Merge pull request #4307 from damianmoore/mysql_gzip_bzip2_support
Add support for compressing mysql dumps and extracting during import.
2013-11-07 15:07:59 -05:00
jctanner
6a5672c997 Merge pull request #4835 from sivel/rax-clb
Add module to create Rackspace Cloud Loadblancers. Fixes #4794
2013-11-07 11:15:23 -08:00
Matt Martz
2065253c3e Rename rax_clb to rax_clb_nodes in docs and examples 2013-11-07 12:56:59 -06:00
jctanner
e36781dace Merge pull request #4603 from claco/rax_network_module
Add rax_network module
2013-11-07 10:49:06 -08:00
Matt Martz
9d684c9e8e If you try to delete a balancer that isn't there, don't blow up 2013-11-07 10:46:50 -06:00
Matt Martz
772fbb8d0a Updates to rax_clb module 2013-11-07 10:42:15 -06:00
Christopher H. Laco
0be54b5585 Added replacement rax_clb that does LB detailed creation 2013-11-07 10:42:15 -06:00
Christopher H. Laco
6a964496b1 Renamed rax_clb to rax_clb_nodes since it's node management and not clb creation 2013-11-07 10:42:15 -06:00
jctanner
015662f5ef Merge pull request #4358 from eslng/apt_add_dpkg_options
apt: allow specifying dpkg options
2013-11-07 08:31:51 -08:00
Bruce Pennypacker
83a1665be5 Made URL an optional parameter 2013-11-07 15:39:41 +00:00
jctanner
277dda5373 Merge pull request #4489 from cove/devel
add docker module
2013-11-07 07:00:23 -08:00
jctanner
6cebfccd7f Merge pull request #4440 from AndydeCleyre/patch-2
Set default of 'yes' for update_cache, as is in the documentation
2013-11-07 06:46:13 -08:00
Matthias Vogelgesang
2649495fa6 Add zypper_repository module
This change adds the "zypper_repository" module to the packaging library. This
module is used to add and remove additional repositories.
2013-11-07 12:06:55 +01:00
Michael Scherer
ea6567dbf7 fix incorrect send_data call. there is no client variable, and send_data
is a class method. Pyflakes complained about it.
2013-11-07 08:11:56 +01:00