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

9108 commits

Author SHA1 Message Date
ToBeReplaced
5e259a8dd9 Make ALL_IN_SCHEMA for tables affect views 
ALL TABLES is considered to include views, so we must check for reltypes
'r' and 'v', not just 'r'. This bug was introduced due to using a
custom, backwards-compatible version of "ALL TABLES IN SCHEMA".
 2016-12-08 11:23:15 -05:00
Robb Wagoner
372a2286db return health of instances and counts 2016-12-08 11:23:15 -05:00
verm666
b898cb656b unarchive: fix work with 0 bytes archives 
This change is in response to issue #1575
 2016-12-08 11:23:15 -05:00
Vladimir Martsul
db646757c1 Add "force" description 
Add "force" option description
 2016-12-08 11:23:15 -05:00
Patrick Roby
e638913c97 iterate through all keys in a more pythonic manner 2016-12-08 11:23:15 -05:00
Patrick Roby
bc5d79fc30 update documentation, adding new params 2016-12-08 11:23:15 -05:00
David Shrewsbury
341efbf7ae Update os_keypair for latest shade 
Uses the latest version of shade for cleaner code. Also, always
return the key dict whether we create the key, or it already exists.
The example using public_key_file is corrected to use a full path
since ~ is not converted for us.
 2016-12-08 11:23:15 -05:00
Evan Carter
98756144cf Add ClassicLink settings to EC2_launchconfig 2016-12-08 11:23:15 -05:00
Andrea Mandolo
ae1080d922 Added some block_device_mapping (disks) informations to EC2 instance module ouput 2016-12-08 11:23:15 -05:00
Andrea Mandolo
a8da674cf4 Added "EC2 instance" termination_protection and source_dest_check changeability at run-time 2016-12-08 11:23:15 -05:00
Tom Paine
df8013182e Parse out space characters in route53 value list 
Fixes: https://github.com/ansible/ansible-modules-core/issues/992
 2016-12-08 11:23:15 -05:00
Michael Weinrich
543cb13f42 Fix connection creation to allow usage of profiles with boto 2016-12-08 11:23:15 -05:00
Toshio Kuratomi
f422782180 Use module.fail_json() instead of sys.exit() 2016-12-08 11:23:14 -05:00
Toshio Kuratomi
53c840e275 Add testing of docs to the core repo 2016-12-08 11:23:14 -05:00
Brian Coca
b261fd8d3e added doc to note that git the command line tool is required for this moduel to function fixes http://github.com/ansible/ansible/issues/11358 2016-12-08 11:23:14 -05:00
Brian Coca
e91818ef77 updated docs to clarify use of exclusive 2016-12-08 11:23:14 -05:00
Roetman, Victor
fa612a14b1 apache2_module documetation update 
requires a2enmod and a2dismod
 2016-12-08 11:23:14 -05:00
Ash Wilson
9f12fd0a26 Default net to 'bridge' in container diff 
This prevents an unnecessary reload when the `net` parameter is unspecified
(i.e. almost always).
 2016-12-08 11:23:14 -05:00
verm666
9b3aa0a9d4 This change is in response to issue #133. 
The original problem is: apt_repository.py connect to launchpad on
every playbook run. In this patch apt_repository.py checks if required
repository already exists or not. If no - paa will be added, if yes -
just skip actions.
 2016-12-08 11:23:14 -05:00
Michael Weinrich
a0466f1f8d Add the option to pass a string as policy 2016-12-08 11:23:14 -05:00
Monty Taylor
869da89b35 Move the order of argument processing 2016-12-08 11:23:14 -05:00
Monty Taylor
377311db56 Add filter ability 2016-12-08 11:23:14 -05:00
Ed Hein
f11c451bfa Fix computation of port bindings. Port bindings configuration can be a list if several host ports are bound to the same guest port. 2016-12-08 11:23:14 -05:00
Davide Guerri
c1d7678cc2 Avoind using lookup() in documentation 
lookup() is currently broken (current Ansible devel branch), so better to avoid
it in our examples.
 2016-12-08 11:23:14 -05:00
Konstantin Gribov
8d91c3a61a Escape spaces, backslashes and ampersands in fstab 
Fixes #530.

It's more generic than #578 which only fixes spaces escaping in name (target dir to mount).
Escaping is used in both `set_mount` (important for `src`, `name` and `opts`) and
`unset_mount` (for `name`).

It's shouldn't be used in `mount` and `umount` since `name` parameter is passed as array element
to `module.run_command`.

Signed-off-by: Konstantin Gribov <grossws@gmail.com>
 2016-12-08 11:23:14 -05:00
Arata Notsu
cc76a479e1 Not use "is" to compare strings 
As "is" tests whether if operands are the same object rather than
they have the same value, potentially causes a wrong result.
 2016-12-08 11:23:14 -05:00
Bryan Fleming
6f8d60a5ed fixes #1120 - privileges using columns 2016-12-08 11:23:13 -05:00
Lucas David Traverso
20aa4c0cea django_manage: Use shebang in manage.py instead of hardcode python 2016-12-08 11:23:13 -05:00
Andrew Davis
4d4d911d6e ansible_facts reflects 1.8 output 2016-12-08 11:23:13 -05:00
Monty Taylor
0c0359798b Add OpenStack Keypair module 
Also deprecate old nova_keypair module.
 2016-12-08 11:23:13 -05:00
Ash Wilson
ea83727fcf Wait for process exit on detached=no. 2016-12-08 11:23:13 -05:00
Ian Clegg
f9c294f1ad Added support for comma seperated feature names in the name parameter of the win_feature module 2016-12-08 11:23:13 -05:00
Tagir Bakirov
8bd367eac7 added 'absent' option to supervisorctl 2016-12-08 11:23:13 -05:00
Stefan Junker
4ee972190b docker: Use a list instead of a dict for volumes according to the docker-py docs. Do not add host-binds to volumes list. 2016-12-08 11:23:13 -05:00
gimoh
fd69c5687b Do not insert extra newline if line already contains it 
When using YAML multi-line strings, e.g.:

- lineinfile:
    dest: /tmp/foo
    line: >
      foo
      bar

the line already ends with a newline.  If an extra newline is appended unconditionally it will lead to inserting an extra newline on each run.
 2016-12-08 11:23:13 -05:00
Jens Carl
9ad15cdae9 - List the name servers of a zone. 2016-12-08 11:23:13 -05:00
Alexis Seigneurin
53e9caa1d0 - 'name' should not be required so as to allow uninstalling a cron_file 2016-12-08 11:23:13 -05:00
Annika Backstrom
6b2c89a422 Force redownload if sha256sum does not match 2016-12-08 11:23:13 -05:00
Igor Khomyakov
03483d2ea5 Check if a service exists 2016-12-08 11:23:13 -05:00
Federico G. Schwindt
b6258a1e4c Document globbing support 2016-12-08 11:23:13 -05:00
sysadmin75
f096359608 ansible-modules-core #530 fix - Mount module does not accept spaces in mount point path 2016-12-08 11:23:13 -05:00
Chris Church
3048626d6e Update docs, add example of using django_manage to run other commands. 2016-12-08 11:23:13 -05:00
Stefan Junker
50fe57fff3 Fix bind-volumes on docker >= 1.4.0 
If bind-volumes are submitted to docker >= 1.4.0 with the volumes set in addition to the binds, docker will create a regular volume and not bind-mount the specified path.
 2016-12-08 11:23:13 -05:00
Federico G. Schwindt
fa463fb1b7 Allow globbing in creates= and removes= directives 
Fixes 1904
 2016-12-08 11:23:12 -05:00
Robb Wagoner
e025effc99 include all launch config properties in the return 
make all properties available when registering the result
which is useful when wanting to launch a stand-alone instance based upon
an existing Launch Config.
 2016-12-08 11:23:12 -05:00
Toshio Kuratomi
870446dd6b Update version_added to 2.0 for the partial option 2016-12-08 11:23:12 -05:00
Jonathan Davila
82b809f0e2 new vpc module. does not contain subnet or route table functionality. 
changed name to ec2_vpc_net

refactored out IGW functionality
 2016-12-08 11:23:12 -05:00
Juan Picca
81ea358b09 synchronize module: add partial option 2016-12-08 11:23:12 -05:00
Toshio Kuratomi
5118d0e3b1 Add note about redirects proxies 
Fixes #1574
 2016-12-08 11:23:12 -05:00
Toshio Kuratomi
0a3150f7d7 Add version_added documentation to log_driver parameter 2016-12-08 11:23:12 -05:00
Toshio Kuratomi
9ecd06fb47 Fix apt_repository so that it does not modify the mode of existing repositories 2016-12-08 11:23:12 -05:00
Michael Weinrich
1f6c177da0 Use aws connect calls that allow boto profile use 2016-12-08 11:23:12 -05:00
Ryan Walls
01a28e7d80 Fix typo in Docker module. 2016-12-08 11:23:12 -05:00
Ryan Walls
9630972c2c Update docker module to avoid false positives when containers are first created. Also have the module check for api compatibility before trying to set a "--log-driver" option. 2016-12-08 11:23:12 -05:00
Ryan Walls
f5c1d8141b Set default "log_driver" option to None in docker module. 2016-12-08 11:23:12 -05:00
Ryan Walls
0df1b01cb2 Update docker module to look at log_driver variable when deciding if container configuration has changed. 2016-12-08 11:23:12 -05:00
Ryan Walls
3419a1e253 Add support for --log-driver option that docker released with Docker 1.6 2016-12-08 11:23:12 -05:00
Alex King
c8ae53b308 Extend hashes that can be specified by crypt_scheme beyond those understood by Apache/Nginx. 2016-12-08 11:23:12 -05:00
Sebastian Gerhards
a979417a4a rhn_register: add support for profilename 2016-12-08 11:23:12 -05:00
Jim Patterson
4185ffc43e Correct check mode for pip in virtualenv. 
Fix #412.  Check mode was always returning changed=True for pip
when the target was in a virtualenv.  The code now uses the normal
tests for determining if change status.
 2016-12-08 11:23:11 -05:00
Lorin Hochstein
abf314c258 django_manage: expand ~ in app_path parameter 
Allow users to specify app_path parameters that contain ~, for example:

app_path=~/myproject
 2016-12-08 11:23:11 -05:00
Pierre-Louis Bonicoli
c366e7acb2 apt_repository: fix file mode 
'set_mode_if_different' method should be called on dest filename and after
'atomic_move' method
 2016-12-08 11:23:11 -05:00
Patrick Roby
b318bc8b43 Add support for listing keys in a specific S3 bucket 
Includes support for specifying a prefix, marker, and/or max_keys. Returns a list of key names (as strings).
 2016-12-08 11:23:11 -05:00
James Cammarata
4239922d07 Updating version_added for new spot_type param in ec2 module 
Also made sure 'choices' were set on the module param, to catch errors
in user's playbooks, etc.
 2016-12-08 11:23:11 -05:00
Toshio Kuratomi
cb776e6190 Fix for when the password file did not exist previously 2016-12-08 11:23:11 -05:00
Jay Taylor
ed279d8175 Added support for spot request type specification (to support persistent spot requests). 2016-12-08 11:23:11 -05:00
Toshio Kuratomi
bd87c11c2a Read the url in in chunks so that we don't use as much memory for large packages 2016-12-08 11:23:11 -05:00
Toshio Kuratomi
2e7dcf3317 Small cleanups. * Import url(lib|parse|lib2) if needed by the module rather than relying on module_utils.urls to do so. * Remove stdlib modules from requirements * Use the if __name__ conditional for invoking main() 2016-12-08 11:23:11 -05:00
Toshio Kuratomi
5f27a073ba Bump amount of file to download in a chunk to 64k. 2016-12-08 11:23:11 -05:00
Jonathan Mainguy
dd0659c83d add download ability to unarchive module 2016-12-08 11:23:11 -05:00
zimbatm
99e2557b42 route53: add support for routing policies 
It is now possible to pass various routing policies if an identity is
provided.

This commit also introduces multiple optimisations:
* Only fetch records for the given domain
* Use UPSERT instead of DELETE+CREATE to update existing records
 2016-12-08 11:23:11 -05:00
billwanjohi
86e679fe3c iam: use modern helper to allow sts 
previous implementation ignored the session token when present
 2016-12-08 11:23:11 -05:00
James Cammarata
5cd3c6ebe6 Update choices and version_added for new gce.py param service_account_permissions 2016-12-08 11:23:11 -05:00
Michal Smereczynski
9d4b252f56 Added new Premium Storage instance sizes and case-related documentation clarification. 2016-12-08 11:23:11 -05:00
murdochr
aae140e6cd Change docs to reflect correct when syntax for matching variable strings as per MD's forum post as this fails with unhelpful error otherwise. 
https://groups.google.com/forum/#!topic/ansible-project/D2hQzZ_jNuM
 2016-12-08 11:23:11 -05:00
Monty Taylor
186fbd7645 Remove duplicate shade requirement 2016-12-08 11:23:10 -05:00
Monty Taylor
73cb529d2c Make sure we're always returning objects too 2016-12-08 11:23:10 -05:00
dagnello
072110c757 Resolving secgroup.id issue in this module 
secgroup['id'] was not being returned in all cases where the
specified security group exists.
 2016-12-08 11:23:10 -05:00
toninog
bea77c938e fixes to code to enable updates of user to groups and delete groups. Fixed example yaml to use groups 2016-12-08 11:23:10 -05:00
toninog
ab7678f199 Fixed more issues with the delete_group and paramater mismatch 2016-12-08 11:23:10 -05:00
Jonathan Mainguy
c9d1cc0ce3 remove blank lines from htpasswd file 
used standard mktemp()
 2016-12-08 11:23:10 -05:00
Vasyl Kaigorodov
758688a667 GCE module: added Service Account permissions sanity checks 2016-12-08 11:23:10 -05:00
Vasyl Kaigorodov
4400c5e163 GCE module: document Service Account permissions parameter usage 2016-12-08 11:23:10 -05:00
Vasyl Kaigorodov
97e880a27f GCE module: add posibility to specify Service Account permissions during instance creation 2016-12-08 11:23:10 -05:00
Jonathan Davila
6482ad964f iam certificate module 
boto import tweak

style patch
 2016-12-08 11:23:10 -05:00
Dan Abel
a51a8e1fd6 use aws connect calls that allow boto profile use 2016-12-08 11:23:10 -05:00
Hagai Kariti
b46a1ff3e1 Hostname module should update ansible_hostname 2016-12-08 11:23:10 -05:00
Vyronas Tsingaras
654d2d3f60 This enable one to find a datastore with no config_target supplied 
Signed-off-by: Vyronas Tsingaras <vtsingaras@it.auth.gr>
 2016-12-08 11:23:10 -05:00
Jon Hawkesworth
a00d86946d document file size limit for win_copy module 2016-12-08 11:23:10 -05:00
Vyronas Tsingaras
56957ca45e Remember power state when starting vm reconfigure 
This commit fixes #1391

Signed-off-by: Vyronas Tsingaras <vtsingaras@it.auth.gr>
 2016-12-08 11:23:10 -05:00
Matt Martz
158772ffc2 Fix some remaining rax asg idempotency checks 2016-12-08 11:23:10 -05:00
Benno Joy
17c185c8d1 enable azure to provision windows instances 2016-12-08 11:23:09 -05:00
Benno Joy
2314670952 enable the module to provision windows instances 2016-12-08 11:23:09 -05:00
Colin Hutchinson
97a2cd0bd9 Indentation fix for with and register in the ec2_vol example 2016-12-08 11:23:09 -05:00
Ritesh Khadgaray
9c3f9d23c8 Add the ability to grep for content 2016-12-08 11:23:09 -05:00
Vyronas Tsingaras
bdb33b5756 Properly check if vm_hardware contains keys 
This commit fixes #1475

Signed-off-by: Vyronas Tsingaras <vtsingaras@it.auth.gr>
 2016-12-08 11:23:09 -05:00
Vyronas Tsingaras
262e86b36b Use either esxi:dc,host OR cluster,resource_pool 
vsphere_guest now can deploy a template using a datacenter and hostname
as the target, instead of requiring a cluster and resource_pool.

This commit fixes #951.

Signed-off-by: Vyronas Tsingaras <vtsingaras@it.auth.gr>
 2016-12-08 11:23:09 -05:00
Robin Roth
abc89f0df5 add comment: ports need to be exposed. 
port mapping with this module only works for ports that are exposed either in the Dockerfile or via an additional arguments. This is different from the command line docker client, that is willing to also map ports that are not exposed.

This comments makes the behaviour more obvious.
 2016-12-08 11:23:09 -05:00
Monty Taylor
8ff71a3fa8 Actually use changed variable 2016-12-08 11:23:09 -05:00
Monty Taylor
4125b576e9 Return the secgroup for all present states 2016-12-08 11:23:09 -05:00
Monty Taylor
b955b2f5c8 Return resource objects from OpenStack modules 
It's not uncommon for people to want to do additional things after
creating a module. Also, add a note about it to the dev notes.
 2016-12-08 11:23:09 -05:00
Monty Taylor
89f95471f8 Return secgroup, not just id 2016-12-08 11:23:09 -05:00
Philip Kirkland
cc214afed6 adding 'encrypted' option into volume dict so ec2 module can easily include encrypted volumes 2016-12-08 11:23:09 -05:00
Toshio Kuratomi
88ae201b20 Fix bugs found by @kustodian 2016-12-08 11:23:09 -05:00
Toshio Kuratomi
f0f1dc985f Fix incorrect line breaking 2016-12-08 11:23:09 -05:00
Toshio Kuratomi
9f043d9ba8 Further optimizations pointed out by @kustodian in #1516 
* Only install yum-utils if needed (b/c we're going to use repoquery)
* Add a warning message explaining that why slower repoquery was used
  rather than yum API.
 2016-12-08 11:23:08 -05:00
Toshio Kuratomi
ba566501a8 Yum API is faster than calling out to repoquery. Looking through the commit logs it looks like we weren't previously doing that because of commit 14479e6adc 
The message there is that Yum API prints an error message if the
rhn-plugin is in use and no rhn-certificate is available.  So instead of
using repoquery in preference always here we use repoquery in preference
if the rhn-plugin is enabled.
 2016-12-08 11:23:08 -05:00
David Shrewsbury
9cbd7b2ece Remove os_security_group_rule module 
The rules module will have it's own branch.
 2016-12-08 11:23:08 -05:00
David Shrewsbury
6527f895a1 Remove 'result' value 
This value is pretty much useless, and a holdover from the old
module code. Let's remove it.
 2016-12-08 11:23:08 -05:00
Monty Taylor
eb2f3c8a44 Update version added 2016-12-08 11:23:08 -05:00
David Shrewsbury
7f0da6d851 Update the docstring for os_security_group 
Indicate that idempotence is on security group names, and give
an example for updating a security group description.
 2016-12-08 11:23:08 -05:00
David Shrewsbury
640dbee643 Update for latest shade API 
Shade version 0.7.0 introduces new API methods for creating,
deleting, and updating security groups. Let's use those and
clean up the module.
 2016-12-08 11:23:08 -05:00
az7arul
5ffb677b00 add include_doc option 2016-12-08 11:23:08 -05:00
Jamie Hannaford
f969bc0549 Fix get_launch_config var name 2016-12-08 11:23:08 -05:00
Jamie Hannaford
6b9310ecfb Fix attribute name for Auto Scale servers 2016-12-08 11:23:08 -05:00
Julia Kreger
d67ba5e25b Updating os_ironic_node module 
Updating the os_ironic_node module to the most recent version
including support for power and maintenance states.
 2016-12-08 11:23:08 -05:00
Julia Kreger
51149b9643 Updating os_ironic module 
Updating os_ironic module to the most recent version accounting for
changes in Ansible devel branch and the shade library since the
original creation of the module.
 2016-12-08 11:23:08 -05:00
nitzmahone
548ab163f5 Added choice validation for state arg 
fixes traceback on invalid state arg
 2016-12-08 11:23:08 -05:00
Toshio Kuratomi
ada424078b Restore setting cachedir when non-root but don't take a useless cachedir parameter to the function 
* Revert "Remove unused code"
  This reverts commit bcfba0c050.
* Re-add the changes to remove cachedir as a parameter
 2016-12-08 11:23:08 -05:00
Greg DeKoenigsberg
4cdd58064d Updated author data for modules 2016-12-08 11:23:08 -05:00
Sergei Antipov
e62f870859 mysql_user | Hide password 2016-12-08 11:23:08 -05:00
Greg DeKoenigsberg
eb881d7d5d Proper author info for all remaining modules 2016-12-08 11:23:07 -05:00
Greg DeKoenigsberg
18ca7aee07 Updating cloud modules with proper github author information 2016-12-08 11:23:07 -05:00
Robert Estelle
8b2327fe3a Fix missing instance_id param in ec2_eip. 2016-12-08 11:23:07 -05:00
Kamil Madac
1ae799f361 Better error handling in supervisorctl module. 
If execution of supervisorctl was not successful (exit code > 0),
module silently supress this error and returns changed = false,
which turns to OK task state.
This is very confusing, when supervisorctl needs authentication,
and credentials are not specified in module or are incorrect,
services are not restarted/started/stopped without raising an error.
 2016-12-08 11:23:07 -05:00
Monty Taylor
574bcac277 Add developer docs for the OpenStack modules 2016-12-08 11:23:07 -05:00
Hagai Kariti
b154ad4cbb ec2_vol: fix race conditions because we handle errors before actually deleting 
Just try to delete the volume and handle the error amazon sends
 2016-12-08 11:23:07 -05:00
Tyler Cross
9babe9b07d Get specific object version with S3 module. 
- allow specifying version for mode=get and mode=getstr
- when version specified doesn't exist give an error message that indicates so
 2016-12-08 11:23:07 -05:00
Pepe Barbe
5dc322b911 Add OS architecture and OS name to the Windows setup module 2016-12-08 11:23:07 -05:00
Monty Taylor
51ce05bfb9 Add Ironic Node module 2016-12-08 11:23:07 -05:00
Monty Taylor
e534753092 Add Ironic module 2016-12-08 11:23:07 -05:00
Monty Taylor
0447a88c80 Add OpenStack Object module 2016-12-08 11:23:07 -05:00
Monty Taylor
234a6c93c7 Add OpenStack Security Group support 
Two modules - one for security groups and one to manage rules in a
security group.
 2016-12-08 11:23:07 -05:00
Robert Estelle
ecae3403af Remove unnecessary wait_timeout parameter. 2016-12-08 11:23:07 -05:00
Robert Estelle
3798c8c0ce Refactoring of ec2_eip module. 2016-12-08 11:23:07 -05:00
Robert Estelle
41f7e4ed5e ec2_eip - PEP8 and minor style cleanups. 2016-12-08 11:23:07 -05:00
Robert Estelle
a41994974c EC2 Security Group - Validate parameters. 2016-12-08 11:23:07 -05:00
Edward Torbett
3a4d8f22a6 Renamed previous pkgs variable to installed_pkgs as spotted by @strahinja 2016-12-08 11:23:06 -05:00
Edward Torbett
dad26d70fa Corrected pkg to pkgs as noted by @abadger 2016-12-08 11:23:06 -05:00
Edward Torbett
9707a5a95e Added multi package operation to remove as suggested by @abadger. Adding to latest is a little more complex due to '*' support. 2016-12-08 11:23:06 -05:00
Edward Torbett
32180c3c0e Comments by @abadger 2016-12-08 11:23:06 -05:00
Edward Torbett
4b3fff108d Rather than executing yum once per package, execute yum once for all supplied packages. This is necessary when performing a yum upgrade involving multiple dependent packages installed from RPM, for example when upgrading from PostgreSQL 9.0.11 to 9.0.21 on a Red Hat server. 2016-12-08 11:23:06 -05:00
Ching Yi, Chan
be9cddbddf Refactoring for easier to read 2016-12-08 11:23:06 -05:00
Ching Yi, Chan
7cafbb5f05 Prevent memory-error from a large file 2016-12-08 11:23:06 -05:00
Soenke Ruempler
b57bcac72f Add support for SNS notification ARNs in CloudFormation 2016-12-08 11:23:06 -05:00
Andrea Mandolo
adb53cc3c5 Add "block_device_mapping" parameter on EC2_AMI Amazon module (DOCUMENTATION) - upgraded 2016-12-08 11:23:06 -05:00
Jon Hawkesworth
c86ed93f67 remove include of files options only relevant to unix from win_file.py documentation 2016-12-08 11:23:06 -05:00
Brian Coca
f66ed3a85e minor doc fixes on win_template 2016-12-08 11:23:06 -05:00
Bruce Pennypacker
4cb7df2631 Added delobj command to delete an object within a bucket 2016-12-08 11:23:06 -05:00
Jon Hawkesworth
a9b77e8480 corrected version added which I got wrong while rebasing 2016-12-08 11:23:06 -05:00