Commit graph

1095 commits

Author SHA1 Message Date
Joshua Lund
be6feee058 Minor cleanup of YAML Syntax documentation 2013-07-22 16:09:18 -06:00
Ches Martin
b35fc42d36 Enhance meta-docs on... contributing to docs.
- Update FAQ entry to refer to docsite README and reduce redundancy.

- Add additional info to docsite README: Sphinx building, link to module
  documentation reference.
2013-07-22 17:20:38 +07:00
Tim Gerla
7e07bca6bf very minor fix to playbooks2 to fix a formatting error 2013-07-21 11:50:12 -07:00
Michael DeHaan
77a4dcca85 Sphinx/docs syntax fixes 2013-07-21 11:18:07 -04:00
Michael DeHaan
feb4a8847d Slight edit to when_changed docs 2013-07-21 10:48:22 -04:00
Michael DeHaan
b603bb0f73 Merge branch 'changed_when-doc' of git://github.com/stoned/ansible into devel 2013-07-21 10:41:35 -04:00
Xiao Hanyu
23ff2f2992 Merging docs 2013-07-20 12:44:37 -04:00
Joshua Lund
e8c6da6045 Cleanup Glossary documentation 2013-07-19 17:32:00 -06:00
Michael DeHaan
9314341923 Merge pull request #3465 from jlund/best-practices
Add documentation for Role Variables to the Best Practices page
2013-07-19 07:33:39 -07:00
Michael DeHaan
ce89382473 Legacy variable removal. 2013-07-19 10:27:37 -04:00
Michael DeHaan
597e5075f1 Merge pull request #3585 from devo-ps/documentation
Minor typo on site about host_key_checking config section.
2013-07-19 06:50:28 -07:00
Michael DeHaan
1867fb4888 Update an example. 2013-07-19 09:49:44 -04:00
Michael DeHaan
10bc6f6d9c Merge pull request #3541 from pol/docs_withitems_regivar
Create with_items example with a registered var
2013-07-19 06:46:31 -07:00
Michael DeHaan
c101d4b30b Documentation indentation fix. 2013-07-19 09:33:31 -04:00
Michael DeHaan
deda5c8ee7 Remove backlinks:top which is setting hyperlinks in docs sections so they are hard to bookmark. 2013-07-19 09:33:31 -04:00
Michael DeHaan
ad5ac71219 Merge pull request #3542 from pol/docs_task_format
Update to conventional task format
2013-07-19 06:26:42 -07:00
Michael DeHaan
f938bc660f Slight documentation tweak. 2013-07-19 09:13:30 -04:00
Michael DeHaan
21e06a87ce Merge pull request #3530 from candeira/with_nested
add documentation for with_nested
2013-07-19 06:11:37 -07:00
Vincent Viallet
6a00cb7b3b Minor typo on site about host_key_checking config section. 2013-07-19 13:26:30 +08:00
Joshua Lund
a5459e8a03 * Added documentation for Role Variables
* Fixed a few minor typos
2013-07-16 14:53:20 -06:00
Pol Llovet
8a0861f804 Create with_items example with a registered var 2013-07-15 17:44:50 -06:00
Pol Llovet
d933fef93f Deprecate only_if in favor of when. 2013-07-15 17:41:09 -06:00
Pol Llovet
bd7448ccf0 Update to conventional task format 2013-07-15 17:35:20 -06:00
Javier Candeira
d3a97bfb07 add documentation for with_nested 2013-07-15 14:28:02 +10:00
Stoned Elipot
60d2ad3642 Document changed_when clause 2013-07-14 21:43:10 +02:00
Michael DeHaan
324a28f3dd Merge pull request #3439 from eest/bestpractices_templates_fix
Fix path to ntp.conf.j2 in example.
2013-07-11 05:31:25 -07:00
Michael DeHaan
90dfc115d6 Merge pull request #3463 from stoned/filterskipped
Add Jinja2 filter 'skipped' to test for a registered variable from a ski...
2013-07-11 05:26:25 -07:00
Joshua Lund
7c78fef1f5 Fixed some minor typos in the Advanced Playbooks documentation 2013-07-10 13:09:12 -06:00
Stoned Elipot
906746b1f0 Add Jinja2 filter 'skipped' to test for a registered variable from a skipped task 2013-07-07 22:13:14 +02:00
Michael DeHaan
d002c2d907 Document 'smart' option and connection type default changes. 2013-07-04 19:10:56 -04:00
Michael DeHaan
107ced7ec5 Mention envrionment variable configuration. 2013-07-04 18:56:46 -04:00
Michael DeHaan
1ead97098d Talk more about transports in documentation. 2013-07-04 18:51:47 -04:00
Patrik Lundin
1f1aa1f0a8 Fix path to ntp.conf.j2 in example.
The "common" role adds "common/templates/" to the src path.
2013-07-04 15:42:46 +02:00
Michael DeHaan
f3dc5707a8 Merge pull request #3282 from jlaska/devel
Reference ansible_lsb.major_release, not ansible_lsb.major_version
2013-06-30 16:43:30 -07:00
Michael DeHaan
39105dc853 Fix RST formatting in documentation (underline too short) 2013-06-30 19:01:06 -04:00
Michael DeHaan
6dd93fa964 Some minor doc tweaks 2013-06-30 18:32:49 -04:00
Michael DeHaan
ee4d9b1516 Merge branch 'devel' of git://github.com/shirou/ansible into devel 2013-06-30 18:28:35 -04:00
Michael DeHaan
f2e3a9a850 Merge pull request #3370 from y-p/PR_role_doc_enh
Add doc example of attaching tags to a role
2013-06-30 14:18:11 -07:00
y-p
a4dfc14a6c Add doc example of attaching tags to a role 2013-06-28 16:28:41 +03:00
shirou
a439afeb8f add description about host parameters in a inventory file. 2013-06-28 17:59:47 +09:00
James Laska
eb2ae8b3c2 Reference major_release, not major_version 2013-06-20 08:23:49 -04:00
Michael DeHaan
85ef79443a Fix a documentation formatting warning. 2013-06-19 22:38:04 -04:00
Joshua Lund
0f81d1630f * Updated all ansible.cc references in the documentation to point
to ansibleworks.com
* Fixed a few misspelled words
2013-06-19 19:34:02 -06:00
Michael DeHaan
58f5bfb4c1 Merge pull request #3252 from tgerla/gettingstarted
Explicitly mention the Linux requirement for the Ansible machine, remove...
2013-06-19 17:08:11 -07:00
Tim Gerla
f2cf8d3e67 Fine-tune Ansible control system OS requirements a bit 2013-06-18 18:19:58 -07:00
Jim Tittsler
240a52906e spelling ansbile->ansible 2013-06-19 10:37:02 +12:00
Tim Gerla
6f426f7986 Explicitly mention the Linux requirement for the Ansible machine, and remove a vestigial heading. 2013-06-18 12:12:37 -07:00
Michael DeHaan
89ee762ab7 Merge pull request #3247 from SirScott/vars_prompt_docs
Document the 'default' argument for vars_prompt.
2013-06-18 11:48:49 -07:00
Joshua Lund
ba853b8c1a Fixed a few small typos 2013-06-18 12:26:40 -06:00
Scott Sturdivant
cc12b85e49 Document the 'default' argument for vars_prompt. 2013-06-18 09:25:51 -06:00
Michael DeHaan
fda74110bd Merge pull request #3202 from trbs/20130613_docs_fix_ansible_cfg_loading_order
docs fix ansible cfg loading order
2013-06-16 20:17:25 -07:00
Michael DeHaan
306caf84f9 Merge pull request #3218 from lorin/fileglob-roles
Document: with_file(glob) relative path and roles
2013-06-16 19:52:22 -07:00
Michael DeHaan
a1d1ce8360 Merge branch 'docs_examples' of git://github.com/jpmens/ansible into standardize_docs 2013-06-16 22:07:20 -04:00
Jan-Piet Mens
5c69918d53 DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)
Migrated all examples: in DOCUMENTATION=''' string to standalone EXAMPLES=''' string
  Added deprecation warning to moduledev.rst and remove deprecated example from it
  Fixed up a few typos and uppercased some acronyms.
  add consistency to how EXAMPLES are formatted
2013-06-15 20:54:25 +02:00
Lorin Hochstein
d7ba2e06eb Document: with_file(glob) relative path and roles
Document that with_file and with_fileglob path is relative to
the files directory inside of a role.
2013-06-14 11:15:45 -04:00
trbs
653fac2f5c fix loading order of ansible.cfg in documentation 2013-06-13 23:13:54 +02:00
Ralph Bean
dd5707ddd9 Well, a little more readability. 2013-06-11 14:58:28 -04:00
Ralph Bean
416e72c900 Fix a typo in the docs. 2013-06-11 14:54:42 -04:00
Michael DeHaan
643b5e2c5d Fix dead link, remove redundant section. 2013-06-10 18:37:56 -04:00
Michael DeHaan
1fd863cf5d Update docs to reference release tarball directory on new site. 2013-06-10 16:06:58 -04:00
Tim Gerla
8a9cded133 re-add docs css class required for some theme elements 2013-06-10 07:57:13 -07:00
Michael DeHaan
36e9cf5d7d Mention YAML variable quoting. 2013-06-09 21:35:51 -04:00
Michael DeHaan
36c3c91d6e Add roles to glossary. 2013-06-09 21:20:35 -04:00
Buce
7d2422cf92 Update supported package managers
Ansible has modules for package managers other than yum and apt,
so update the documentation accordingly.
2013-06-09 17:16:08 -04:00
Buce
563147d344 Reference Inventory & Patterns more
Link to the Inventory & Patterns page in places where the Getting
Started guide refer to it, so that users unfamiliar with the
inventory syntax can easily familiarize themselves with it.
2013-06-09 17:16:08 -04:00
Tim Gerla
b3e0071635 show entire doc index in left sidebar on the documentation home page 2013-06-09 11:04:16 -07:00
Michael DeHaan
92dce671bb Resolve merge commit 2013-06-09 13:57:20 -04:00
Michael DeHaan
d706aca82b Merge 2013-06-09 13:55:58 -04:00
Michael DeHaan
2f37314d41 Revise section referencing 1.1 since release is Monday. Will push with release. 2013-06-08 14:15:10 -04:00
Michael DeHaan
cabeafc550 Remove 1.1 reference (docs will be pushed with release of 1.2) 2013-06-08 14:14:12 -04:00
Bartłomiej Piotrowski
cd65bbc1c4 Add info about apk-tools module to contrib.rst. 2013-06-06 15:00:05 +02:00
Tim Gerla
a26cbd957c fix heading styles for 'pending information' to avoid creating a new top-level chapter 2013-06-04 14:57:43 -07:00
Patrick Regan
4e5c0da7d6 Trivial typo fix in Amazon documentation 2013-06-03 13:54:26 -04:00
Serge van Ginderachter
18e7974021 add mention of github.com/ginsys/ansible-plugins in contrib.rst 2013-06-02 17:56:12 +02:00
Michael DeHaan
7f0e89a2f6 Explain when statements with |failure and |success. 2013-06-01 17:41:31 -04:00
Michael DeHaan
754d5f91a3 Show how to set PW length. 2013-06-01 12:36:24 -04:00
Michael DeHaan
bddbdd4881 avoid duplicate hyperlink warning (silly Sphinx) 2013-06-01 12:22:06 -04:00
Michael DeHaan
1de2028677 Update docs about examples, add edX online's configuration repo to examples 2013-06-01 11:46:32 -04:00
Michael DeHaan
9f567f05d6 Document group_vars and host_vars additional paths. 2013-06-01 10:40:39 -04:00
Michael DeHaan
fbba92b61e Add an example of JSON extra variables on the command line. 2013-05-31 16:07:40 -04:00
Jan Duzinkiewicz
8ebd1792eb advanced playbooks docs yaml snippets always use --- 2013-05-31 10:54:13 +02:00
Michael DeHaan
e75ab08e3d Merge pull request #3054 from maxamillion/maxamillion/docsite
provide link to older docs when mentioning older docs
2013-05-29 16:55:30 -07:00
Michael DeHaan
53c490f453 Merge pull request #3050 from lorin/os-grizzly-only
Document: OpenStack inventory script needs grizzly
2013-05-29 15:54:49 -07:00
Michael DeHaan
fd77804bff Merge pull request #3017 from sergevanginderachter/roles-script
Add roles support for the script module
2013-05-29 15:54:18 -07:00
Adam Miller
80bf5d49fe provide link to older docs when mentioning older docs 2013-05-29 17:29:59 -05:00
Michael DeHaan
0a28358ebc Minor docs tweak. 2013-05-29 18:27:16 -04:00
Michael DeHaan
c9b2df619b Merge pull request #3043 from mvo5/feature/document-facts
Feature/document facts
2013-05-29 15:23:15 -07:00
Michael DeHaan
31b31a12e7 Merge pull request #3052 from chelsea/devel
Updated loop documentation with explicit example of hash usage
2013-05-29 15:21:19 -07:00
Adam Miller
33870745b1 fix ambiguous use of automatically automatic in Roles docs 2013-05-29 17:14:20 -05:00
Chelsea Robb
b8045bc29e Updated loop documentation with explicit example of hash usage 2013-05-30 08:05:14 +10:00
Michael DeHaan
b5ed926720 Add AWS doc to table of contents. 2013-05-29 14:17:32 -04:00
Lorin Hochstein
bbe352b544 Document: OpenStack inventory script needs grizzly
The OpenStack Inventory script uses the OS-EXT-IPS:type parameter
to distinguish between fixed and floating IP addresses.
This was only added in the Grizzly release, see
https://bugs.launchpad.net/nova/+bug/1117784

Specify in the docs that this inventory script requires Grizzly
or greater.
2013-05-29 11:38:11 -04:00
Michael DeHaan
267b29cec7 Manpage tweaks, docs rebuild 2013-05-29 10:30:04 -04:00
Michael DeHaan
efee2e2630 Some tweaks to EC2 docs 2013-05-29 10:25:54 -04:00
Michael DeHaan
383b8ce14a Merge branch 'awsdocs' of git://github.com/lwade/ansible into devel 2013-05-29 10:15:02 -04:00
Michael DeHaan
2c433cb707 Add an example of Jinja2 casting. 2013-05-29 09:43:32 -04:00
Michael Vogt
746edecf68 fix indent 2013-05-28 18:32:14 +02:00
Michael Vogt
b625f99938 fix typo 2013-05-28 18:25:44 +02:00
Michael Vogt
e13842fad1 add gathering-facts example 2013-05-28 18:23:12 +02:00
Michael Vogt
03e9d9a742 update info on debian/ubuntu packages 2013-05-28 18:12:33 +02:00
Serge van Ginderachter
5859af7285 script support for roles: use the files/ directory
instead of an additional scripts/ directory
2013-05-25 16:51:59 +02:00
Serge van Ginderachter
0224dc464d roles/x/scripts support: update docs
also added example on where regular tasks fit in
2013-05-24 22:42:24 +02:00
lwade
07a1b2f1c1 Start of aws best practices docs 2013-05-24 16:59:24 +01:00
Michael DeHaan
8475a92dec Merge pull request #2939 from mmoya/lookup-crypted-passwds
Add support for crypted passwords to password lookup
2013-05-18 13:17:41 -07:00
Maykel Moya
96afc3f462 Add support for crypted passwords to password lookup
Added new parameter 'encrypt' with same semantics from that of
vars_prompt. When encryption is requested a random salt will be
generated and stored along the password in the form:
'<password> salt=<salt>'.

Also store passwords with an ending '\n' for easier looking at files
with console tools. File content was being already rstripped so this
is harmless.
2013-05-16 13:24:54 +02:00
Stoned Elipot
2b58e03571 Fix registered variable usage example 2013-05-15 22:11:07 +02:00
Michael DeHaan
8a860779fd Add some notes about 1.2 things, just to make it more obvious. 2013-05-11 16:40:09 -04:00
Michael DeHaan
0748e86f0e Fix documentation about examples in modules so folks use the new style. 2013-05-11 16:32:22 -04:00
Maykel Moya
db618f837f Fix link to Ansible Resources in moduledev page 2013-05-07 13:01:53 +02:00
Michael DeHaan
1b5dd3f15b Clean up variable examples to say "$x" is still fine for a reference. 2013-05-05 13:21:47 -04:00
Michael DeHaan
63b4eea90b Remove searchindex.js from source control. 2013-05-05 12:51:27 -04:00
Michael DeHaan
d1a59fe62b Merge branch 'when_docs' of git://github.com/tartansandal/ansible into devel
Conflicts:
	docsite/latest/rst/playbooks2.rst
	docsite/latest/searchindex.js
2013-05-05 12:43:06 -04:00
Kahlil (Kal) Hodgson
cabd40b0aa add docs for 'when: var is defined' idiom 2013-05-03 08:57:31 +10:00
Lorin Hochstein
c66b724817 Document: sudo works per-task too
Document that you can use sudo at the task level as well
2013-05-02 15:14:53 -04:00
Michael DeHaan
ce67588dcf Fix module doc organization 2013-05-02 11:35:24 -04:00
Michael DeHaan
627b6a0455 Have 1.2 clear in docs 2013-05-02 11:31:51 -04:00
Tim Gerla
bdf50d1fb7 Fix up a couple of references to 'only_if' and change them to 'when' 2013-05-02 09:22:08 -04:00
Michael DeHaan
4ce6eca8b3 Slight tweak to set_fact variable documentation to clarify scope info. 2013-04-29 19:15:29 -04:00
Michael DeHaan
4bea9a612f Don't use "finally" here as it's not 2.4 compliant. 2013-04-28 16:03:03 -04:00
Michael DeHaan
391fb98ee2 Allow modules to be categorized, and also sort them when generating the documentation. 2013-04-28 15:03:45 -04:00
Michael DeHaan
0fd3af8c3c Document regex patterns. 2013-04-27 12:04:22 -04:00
Michael DeHaan
099e7b39a9 use lookup macro rather than with to demonstrate lookup plugins 2013-04-27 11:59:33 -04:00
Michael DeHaan
a61824470d Update gitignore 2013-04-27 11:55:31 -04:00
Michael DeHaan
b6a8d402c5 Document variables are reserved. 2013-04-27 11:54:30 -04:00
Lars Vogdt
21d9789377 added informations for openSUSE and SUSE Linux Enterprise 2013-04-26 11:08:13 +02:00
Michael DeHaan
13e90c396c Merge pull request #2733 from chadoh/patch-1
Documentation: Mention vars_files before the Roles section in playbooks1 chapter
2013-04-22 21:21:30 -07:00
Stoned Elipot
e1ee257619 Default sudo password to SSH password.
While here factor out password prompting in ansible.utils
2013-04-22 23:57:50 -04:00
Michael DeHaan
b1d40ed064 Merge pull request #2734 from chadoh/patch-2
Documentation: Links are the best kinds of instructions
2013-04-21 14:13:06 -07:00
Jim Kleckner
5e5235a433 Nit fix spelling of separate 2013-04-21 12:33:51 -07:00
Chad Ostrowski
e1396f853b Links are the best kinds of instructions
Link people right to this page on Github, so they can click "edit" right there. No need for them to search for the repo, figure out that the docsite isn't a separate repo, and navigate to the given dir.
2013-04-21 13:58:06 -03:00
Chad Ostrowski
0bb145af40 Mention vars_files before the Roles section
The Roles section assumes some familiarity with vars_files, which this note attempts to briefly provide.
2013-04-21 13:45:45 -03:00
Michael DeHaan
7fabaec55f Fix doc formatting error 2013-04-20 22:48:20 -04:00
Michael DeHaan
c9a128a5c5 Rewrote the precedence docs. 2013-04-20 22:44:40 -04:00
Michael DeHaan
cf3c77661b Document the new handler flushing system. 2013-04-20 18:10:01 -04:00
Michael DeHaan
84781bf185 Add documentation about pre_tasks and post_tasks with roles. 2013-04-20 16:21:52 -04:00
Michael DeHaan
adac8f5312 Showcase the new-style lookup plugin access in the authorized_key docs rather than the old-style $FILE 2013-04-20 09:10:19 -04:00
Michael DeHaan
cce2cad8dc Fix with_sequence doc error 2013-04-16 20:42:06 -04:00
Michael DeHaan
84fb92dac6 Working on the FAQ. 2013-04-14 19:32:06 -04:00
Michael DeHaan
728d81bf12 Add link to prior docs version. 2013-04-12 21:48:00 -04:00
Michael DeHaan
62fe4cc3af Explain conditionals as applied to roles. I could also explain with_items but the scope questions are complex
here, and it is better to include such loops inside the imported tasks.
2013-04-12 20:46:12 -04:00
Michael DeHaan
687a68091f Mention roles in best practices 2013-04-12 18:26:17 -04:00
Michael DeHaan
ffb00d2071 Favor {{ foo }} rather than $foo in documentation. 2013-04-12 18:21:09 -04:00
Michael DeHaan
9ed246e432 Resolve merge conflict. 2013-04-12 17:51:55 -04:00
Michael DeHaan
26819d707d Reorganize docs structure to support snapshots. 2013-04-12 17:50:50 -04:00
Michael DeHaan
e63dac15eb Moving some more files into snapshot directory 2013-04-12 17:47:04 -04:00
Michael DeHaan
148d8859ba Docs on parameterized roles, make document generation output less noisy 2013-04-12 17:45:27 -04:00
Michael DeHaan
a0a2ef3d9d Merge pull request #2640 from trevor/devel
make json valid
2013-04-11 09:35:46 -07:00
Trevor Wennblom
b779fa4fe9 make json valid 2013-04-10 23:43:16 -05:00
Michael DeHaan
c5d9823467 Fix some items related to playbook includes and indentation. 2013-04-10 15:04:41 -04:00
gw0
80a4e02372 Improved Lookup plugins documentation 2013-04-05 20:00:23 +03:00
Michael DeHaan
f9890c9973 Show other way to ignore command/shell errors 2013-03-29 21:38:33 -04:00
Michael DeHaan
bccab0f2b7 Merge pull request #2514 from raphinou/patch-1
replaced && by ||
2013-03-29 18:36:53 -07:00
Michael DeHaan
cdf5e006ff Merge pull request #2508 from tgerla/devel
Add some examples for local_action and rsync
2013-03-29 05:46:40 -07:00
Victor Castell
ceede2f71f Place ad-hoc stuff from docs under context 2013-03-28 16:39:06 +01:00
raphinou
ba2582fff6 replaced && by ||
In the example, you want /bin/true to be executed if the first command has an error return code. Combining command with && will run the second only if the first is successful. Combining them with ||, the second will be run only of the first fails, what is wanted here.
2013-03-27 14:37:31 +01:00
Tim Gerla
d3a7c729ab Add a note regarding rsync and ssh-agent/passphrase-less keys 2013-03-26 19:37:06 -07:00
Tim Gerla
0e01085ab6 Add some examples for local_action and rsync 2013-03-26 13:34:16 -07:00
Michael DeHaan
783a12cc0e Resolve merge commit. 2013-03-25 22:32:01 -04:00
Michael DeHaan
518007a1ba Fix version added attribute, update docs URL 2013-03-25 10:56:32 -04:00
Michael DeHaan
3d5aa5dc2c Merge pull request #2487 from dorfsmay/20130322
fixed doc regarding wild card pattern on groups.
2013-03-24 14:26:07 -07:00
michael@ansibleworks.com
ecda87cb63 Fixup docsite links 2013-03-24 16:41:20 -04:00
michael@ansibleworks.com
e086d6fd89 Doc updates 2013-03-24 16:41:20 -04:00
Yves Dorfsman
5485451ddb fix doc regarding wild card pattern on groups. 2013-03-22 23:05:40 -06:00
Tim Gerla
242f988daf Add links to the ansible-examples repository 2013-03-20 09:45:41 -07:00
Yves Dorfsman
8b10cc5946 Mention of ansible-doc and man pages for modules. 2013-03-18 20:31:42 -06:00
Michael DeHaan
22cd10bc6f Add note about wanting to do crypted passwords with $PASSWORD plugin. 2013-03-17 11:48:27 -04:00
Michael DeHaan
afb9ad1358 Fix duplicate Sphinx target in documentation. 2013-03-17 11:46:25 -04:00
Michael DeHaan
64a3839511 Fixup documentation formatting 2013-03-17 11:45:22 -04:00
Lorin Hochstein
efd3cbe8b4 Document how to implement check mode
Fixes #2410
2013-03-16 21:45:22 -04:00
bfx81
649dc25d46 Updated getting ansible on gentoo 2013-03-16 15:21:04 +01:00
Michael DeHaan
7d6d009d15 Merge pull request #2411 from tyll/docs
glossary.rst: fix type regarding file mode
2013-03-15 18:07:28 -07:00
Lorin Hochstein
c7cf2bc343 Docfix: ANSIBLE_LIBRARY_PATH -> ANSIBLE_LIBRARY 2013-03-15 14:55:53 -04:00
Till Maas
2b4621d8d7 glossary.rst: fix typo regarding file mode 2013-03-15 19:43:47 +01:00
Yves Dorfsman
2d0df2f233 Rephrased an awkward sentence. 2013-03-12 10:25:44 -06:00
Yves Dorfsman
d1d7d56315 typo in playbooks2.rst 2013-03-12 10:21:57 -06:00
Michael DeHaan
c53653dc0d Merge pull request #2348 from candeira/password-plugin
password lookup plugin, with working tests and documentation
2013-03-10 16:31:17 -07:00
Michael DeHaan
daf7419f3a Make Python 3 instructions a bit more clear. 2013-03-17 23:26:57 -04:00
Javier Candeira
ca6c36e1ac password lookup plugin, with working tests and documentation 2013-03-10 13:36:53 +11:00
Michel Blanc
9c6b28c218 Update gettingstarted.rst
Adds note on python 3 incompatibility
Added note about ansible_python_interpreter for people having python3 as default interpreter (mainly Arch users ?)
Should fix #2344
2013-03-08 23:09:28 +01:00
Jim Kleckner
92844d3dcd Minor spelling fixes 2013-03-06 10:41:19 -08:00
Michael DeHaan
b11cf15b3e Merge pull request #2302 from leucos/patch-1
Update playbooks2.rst
2013-03-05 17:14:47 -08:00
Michael DeHaan
0b1343a281 Merge pull request #2306 from tbielawa/docdepends
Update the Makefile and build-site.py to notify of missing dependencies
2013-03-05 17:14:02 -08:00
Tim Bielawa
badb41390e Update the Makefile and build-site.py to notify of missing dependencies for doc compiling 2013-03-05 13:59:39 -05:00
Michel Blanc
aeed04b73f Cosmetic fixes
Fixed typo in passlib URL link
Fixed style in cryp scheme list
Fixed bullet 7 in variable precedence section
Adds statement regarding passlib requirement
2013-03-05 17:28:09 +01:00
Michel Blanc
f3b06a3008 Adds crypt scheme list for vars_prompt
Added more details on encrypt usage for vars_prompt, including a list of
crypt schemes and a ling to the passlib documentation.
2013-03-05 17:19:14 +01:00
Michel Blanc
d03954a24b Update playbooks2.rst
Added doc on encrypt capability of vars_prompt.
Assuming the example in https://github.com/ansible/ansible/blob/devel/examples/playbooks/prompts.yml is still valid.
2013-03-05 16:26:24 +01:00
Dag Wieers
59912b47be Allow 'make rpm' without the need for env-setup
As it used to be before, 'make rpm' from a cloned repository should work without the need to run hacking/env-setup. It's an easy fix, in line with what we already did for the man-pages.
2013-03-05 11:12:00 +01:00
Daniel Hokka Zakrisson
b130716b61 YAML requires quoting the entire value when it starts with a quote
Fixes #2280.
2013-03-02 21:35:51 +01:00
Michael DeHaan
de09e9dade Update doc reference to clarify that $item isn't expanded here. 2013-03-02 11:47:43 -05:00
Brian Coca
372b60a5f7 Added tip about ANSIBLE_KEEP_REMOTE_FILES to docsite
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-03-01 19:13:37 -05:00
Michael DeHaan
a19a0ca91b Update documentation on complex args to new simpler format. 2013-03-01 17:08:36 -05:00
Michael DeHaan
ff32e404d5 Most people are better off doing looping inside the playbook versus
outside, and get confused about scope.  As a result simply this documentation
feature by not talking about it :)
2013-03-01 16:20:50 -05:00
Daniel Hokka Zakrisson
52c9a7af24 Fix references to user.username to be user.name 2013-02-28 14:02:59 +01:00
Cliffano Subagio
19082f7b20 Fix proxy env format
The incorrect format (e.g. http_proxy=http://proxy.bos.example.com:8080) gave this error: "environment must be a dictionary".
2013-02-28 10:39:08 +11:00
Michael DeHaan
f6e3583b9b Fix path to DOCUMENTATION.yml 2013-02-25 09:36:50 -05:00
Michael DeHaan
3aceae57af Fixup documentation formatting 2013-02-25 09:35:05 -05:00
Michael DeHaan
a5e4f4461e Add linode example, remove macports since it didn't do changed=True/etc 2013-02-25 09:35:05 -05:00
Michael DeHaan
bd6852eda0 Merge branch 'doc_html_tweaks' of git://github.com/nigelm/ansible into devel 2013-02-25 09:24:56 -05:00
Michael DeHaan
7a6f3e6a6a Missing colon in docs. 2013-02-25 09:22:10 -05:00
Nigel Metheringham
9ae64ffba9 Added top padding to h2 elements so not under menubar 2013-02-24 13:01:09 +00:00
Nigel Metheringham
86d55c1c4d Tweak maximum length of drop down menu 2013-02-24 12:20:16 +00:00
Lorin Hochstein
2e8533aec2 Add a missing :: in an .rst file
Other changes are just eating trailing whitespace.
2013-02-23 16:47:47 -05:00
Michael DeHaan
908a192736 Documentation updates 2013-02-23 15:17:50 -05:00
Michael DeHaan
c86b34dae1 Lots of docsite additions for new features + cleanup lineinfile YAML docs 2013-02-23 15:08:33 -05:00
Michael DeHaan
3422ae6737 Document how to do task includes using with_items and externalized data. 2013-02-23 14:56:25 -05:00
Michael DeHaan
9a04c7eabc Add more 1.1 features 2013-02-23 14:37:50 -05:00
Michael DeHaan
d8a77c0468 Add some 1.1 feature documentation 2013-02-23 14:34:29 -05:00
Michael DeHaan
69f0ce422e temporarily disabled, want to re-layout this later. 2013-02-23 13:37:41 -05:00
Michael DeHaan
f01def384f Nothing references DOCUMENTATION.yaml, and it's incomplete, so remove it. 2013-02-23 13:36:15 -05:00
Michael DeHaan
7650d7c20e Explain ansible_python_interp. a little better 2013-02-23 13:33:21 -05:00
Michael DeHaan
1c6b0f93f1 Best practices doc updates 2013-02-23 13:33:21 -05:00
Michael DeHaan
a2915bff8d Fix typo in svc docs 2013-02-23 13:33:21 -05:00
Michael DeHaan
e51707711c Merge pull request #2120 from jpmens/doc_ex1
Add support for additional EXAMPLES string in Ansible modules
2013-02-23 08:58:34 -08:00
Nigel Metheringham
185790e32a Change title of localtoc menu from Page to Section 2013-02-22 21:18:43 +00:00
jibs
fbe0b2ab43 minor docs tweak: link directly to ec2 ini file 2013-02-21 15:24:45 +00:00
Jimmy Tang
7f980bba8f Added more users of ansible (TCHPC and DRI) 2013-02-20 14:19:12 +00:00
Michael DeHaan
7f9bb9084f Rewrite best practices section. 2013-02-18 23:29:27 -05:00
Jan-Piet Mens
396a07bcc7 Add support for additional EXAMPLES string in Ansible modules
return DOC and EXAMPLES as a list
add moduledev explanation
more
2013-02-18 20:02:46 +01:00
Lorin Hochstein
c6778e796c Specified when PIPE_ONCE was added.
Also, now shows when "Getting values from files" was added, a sphinx
directive was missing a colon.
2013-02-17 12:55:47 -05:00
Lorin Hochstein
ec16b854a5 Document new PIPE_ONCE macro 2013-02-17 12:47:51 -05:00
Michael DeHaan
c000bd846b Hate to do this, but URI module docs were constructing messed up RST files, so removing examples for now. Will ask someone to work on them. 2013-02-16 18:45:59 -05:00
Michael DeHaan
ae2d7eb7af Rough cut at adding a glossary section. This could definitely use some improvements, proof reading, and lots of cross linking. 2013-02-16 18:36:06 -05:00
Michael DeHaan
a6653a8723 Clean up the installation section and mention pip. 2013-02-16 16:06:30 -05:00
Michael DeHaan
4d880ec69a Updating links to useful articles 2013-02-16 15:54:05 -05:00
Michael DeHaan
02db951708 Update releases link on getting started page. 2013-02-16 15:51:31 -05:00
Michael DeHaan
8333b4eb03 Better explain magic variables 2013-02-16 15:49:42 -05:00
Michael DeHaan
408deab4e0 Slight doc tweak 2013-02-16 15:28:52 -05:00
Michael DeHaan
32f682946f Add video link to docsite 2013-02-16 15:18:42 -05:00
Michael DeHaan
c79f8cc316 add user to who uses page 2013-02-16 14:53:52 -05:00
Michael DeHaan
6f0c9592bb Additions to Who Uses Ansible 2013-02-09 23:05:09 -05:00
Michael DeHaan
85b52ca625 Resort the who uses ansible page 2013-02-09 22:49:00 -05:00
Michael DeHaan
f41cf5528c Add complex networking setup to docs! 2013-02-09 22:47:19 -05:00
Michael DeHaan
550a1b5f02 Remove mercurial module reference now that we have a cleaned up hg module in core now! 2013-02-09 14:13:46 -05:00
Michael DeHaan
5457e969db Add a reference to Coderwall for tips & tricks! 2013-02-09 14:13:46 -05:00
Lorin Hochstein
44084a83a4 Document :& host notation and using variables with hosts 2013-02-09 10:47:52 -05:00
Michael DeHaan
7d43865e13 Merge pull request #1986 from jcftang/devel
Documentation Fixes relating to OSX and macports
2013-02-07 05:04:03 -08:00
Stoned Elipot
312ba593fd Fix yum module examples: the 'pkg' parameter is now 'name' 2013-02-07 13:27:53 +01:00
Jimmy Tang
7a40ed41f7 Documentation Fixes relating to OSX and macports
Insert some notes about installing on OSX via macports
2013-02-04 19:57:33 +00:00
Michael DeHaan
5cdc25ec47 Tweak documentation example about lookup plugins 2013-02-02 12:56:56 -05:00
Michael DeHaan
f4dddfdbab Fixup inventory docs 2013-02-02 12:43:05 -05:00
Michael DeHaan
dd91452eda Better explain precedence. 2013-02-02 12:29:49 -05:00
Michael DeHaan
bf088a50aa Add when_failed/changed dates 2013-02-02 12:26:26 -05:00
Michael DeHaan
cde5b4b80c Reference sudo flag changeability. 2013-02-02 12:24:48 -05:00
Michael DeHaan
1e3df3b5ab Show how to assign lookup plugins in variables 2013-02-02 12:19:21 -05:00
Michael DeHaan
fe5ab64b62 Document lookup plugin shorthand 2013-02-02 12:03:48 -05:00
Michael DeHaan
78ecc45d4d Document other syntaxes 2013-02-02 12:02:08 -05:00
Michael DeHaan
0ae7f996f5 Make sure all the lookup plugins are documented. 2013-02-02 11:51:25 -05:00
Jeff Blaine
aaf6173fbe Correct python module name for jinja2 2013-01-28 12:52:47 -05:00
Lester Wade
33cc9719ba Update docsite/rst/who_uses_ansible.rst
Added Eucalyptus.
2013-01-25 15:20:43 +00:00
Daniel Hokka Zakrisson
950e3052b8 Merge pull request #1890 from elventear/rabbitmq_contrib
RabbitMQ Contrib
2013-01-23 02:36:45 -08:00
Brendan Taylor
ab63c24358 Make diagram of Directory Organization best practice match the text.
The text and playbook content assumed a directory structure that didn't
match the diagram.
2013-01-22 16:00:14 -07:00
Pepe Barbe
9dfa3ca88f Add my repo for RabbitMQ stuff 2013-01-22 13:23:58 -06:00
Daniel Hokka Zakrisson
94a1c221bc Update variable precedence section with current rules 2013-01-22 16:56:04 +01:00
Michael DeHaan
ea45423f92 Merge pull request #1885 from vincentvdk/devel
added info of required packages to build rpms
2013-01-21 12:36:29 -08:00
Vincent Van der Kussen
4af54e8a3b stylistic change. 2013-01-21 20:49:43 +01:00
Michael DeHaan
1cae679271 Merge pull request #1881 from fdavis/when_changed_fail
add when_changed when_failed example to docsite
2013-01-21 06:57:02 -08:00
Vincent Van der Kussen
614826bcda Fixed my typo and forgot a package 2013-01-21 15:28:16 +01:00
vincent Van der Kussen
80f82f80d8 added info of required packages to build rpms 2013-01-21 15:22:12 +01:00
fdavis
7899e29395 add when_changed when_failed examples to docsite
whitespace fix
2013-01-20 15:50:21 -08:00
Tim Gerla
b814f3dc66 Correct --private-key argument name in Getting Started 2013-01-20 13:24:03 -08:00
Jan-Piet Mens
fc3f50454d typo in ssh private key name 2013-01-12 15:54:21 +01:00
Jayson Vantuyl
13ddd39db9 add with_sequence lookup plugin
Plugin allows you to do easy counts for items.
2013-01-09 15:30:24 -08:00
Daniel Hokka Zakrisson
073fb21bcb Document that task includes are now infinite depth 2013-01-09 13:41:14 +01:00
Francis Besset
e246304256 [docsite] Added LEMP selected playbook 2012-12-24 12:25:17 +01:00
Michael DeHaan
04195e202d Merge pull request #1747 from njharman/alpharange
Alphabetic inventory hostname patterns.
2012-12-17 16:52:11 -08:00
Javier Candeira
dac83c15a0 fix documentation for authorized_key in advanced playbooks page in docsite 2012-12-18 07:23:40 +11:00
Dag Wieers
66fb7fd9de Make use of yes/no booleans in playbooks
At the moment Ansible prefers yes/no for module booleans, however booleans in playbooks are still using True/False, rather than yes/no. This changes modifies boolean uses in playbooks (and man pages) to favor yes/no rather than True/False.

This change includes:

- Adaptation of documentation and examples to favor yes/no
- Modification to manpage output to favor yes/no (the docsite output already favors yes/no)
2012-12-14 11:56:53 +01:00
jkleint
e363abeca7 Missing colon in $FILE example 2012-12-13 16:21:25 -05:00
Mark Theunissen
660bb43e21 Tweak docs for correct paths and filenames 2012-12-12 11:55:52 +02:00
Norman J. Harman Jr
6603737e4d Alphabetic inventory hostname patterns.
- Code, docs, tests.
  - Also added test of large range 000-142 to verify alpha range did not
    break this.
2012-12-10 20:48:38 -06:00
Daniel Hokka Zakrisson
8d309e0fa3 Allow inventory scripts to define groups of groups and group vars 2012-11-28 23:37:29 +01:00
Michael DeHaan
21d858f36d Document new types of plugins. 2012-11-26 18:47:33 -05:00
Michael DeHaan
da90c5f75e Document 'when' and tweak the code to be a little more comprehensive on what is false. 2012-11-26 18:37:44 -05:00
Michael DeHaan
08b3c77dc7 Tweak docs 2012-11-26 18:29:54 -05:00
Michael DeHaan
c8d004434f Limit seperator docs. 2012-11-26 18:29:27 -05:00
Michael DeHaan
9870224991 Tweak fireball docs for 0.9 2012-11-26 18:27:55 -05:00
Jens Rantil
6e3e1c74c9 Fix minor spelling mistake in docsite 2012-11-24 22:55:56 +01:00
Jan-Piet Mens
caf003c813 DOCUMENTATION strings 2012-11-21 18:49:30 +01:00
Michael DeHaan
b46505d59d Update changelog and contrib.rst 2012-11-19 14:18:55 -05:00
Daniel Hokka Zakrisson
b95bcf1b9d Use single-quotes to contain SSH keys as they may contain double-quotes
Fixes #1624.
2012-11-18 18:31:57 +01:00
Michael DeHaan
89bb1b8368 Fixup fireball installation playbook 2012-11-14 18:39:01 -05:00
Michael DeHaan
096607eea4 Allow fireball to transfer binary files, fixup fireball docs, make fetch work with fireball. 2012-11-14 18:37:17 -05:00
Michael DeHaan
8c0f83a2c9 Update "Who Uses Ansible" 2012-11-14 18:21:06 -05:00
Fabian Arrotin
fba75aac0a Added Action.IO to who_uses_ansible and ansible-provisioning to contribs 2012-11-09 17:52:54 +01:00
Fabian Arrotin
2b3aeda33b Added jp_mens' presentation and removed dead links 2012-11-09 17:30:36 +01:00
Dag Wieers
2bccd7b1ac Fix example where imported ssh keys contain spaces
This fixes #1521
2012-11-07 23:58:16 +01:00
Michael DeHaan
aa0af271d6 Quote some stuff in docs 2012-11-03 19:27:14 -04:00
Michael DeHaan
5bda1fc6cc Fix broken link 2012-11-03 19:25:17 -04:00
Michael DeHaan
ac3983a249 revise docs text 2012-11-03 19:19:14 -04:00
Fabian Arrotin
c5a66e96a2 Added the ansible_ssh_host and ansible_ssh_port variable in the patterns/inventory file 2012-10-31 14:43:06 +01:00
Michael DeHaan
2ae090b1db Update 'who uses' page 2012-10-27 18:10:24 -04:00
Michael DeHaan
8dbe6b6a74 Add HP on request 2012-10-25 23:26:24 -04:00
Michael DeHaan
ebd9673ceb Tweak docsite re: resources/contrib page 2012-10-25 23:17:05 -04:00
Jan-Piet Mens
2d4e5ced90 Move contrib to .rst off the main docsite 2012-10-25 14:14:34 +02:00
Jeroen Hoekx
b6ead4d9f8 Add D square to who_uses_ansible. 2012-10-24 15:05:35 +02:00
Nigel Metheringham
ccd8d7c287 Spelling fixes 2012-10-23 15:54:16 +01:00
Nigel Metheringham
dd5629cd51 Correct $last_result example in playbooks doc 2012-10-23 15:51:11 +01:00
Jan-Piet Mens
feab57e270 Reformat code: examples consistently
- added terse syntax to modules.rst
 - added description of special variables to template module
2012-10-23 15:14:01 +02:00
Michael DeHaan
109632e3bc Revert "Vars specified via CLI have the highest priority."
Reverting as this as reported allows some variables to clobber each other.
We'll work on a different fix.

This reverts commit c5469f6367.
2012-10-21 16:42:15 -04:00
Dag Wieers
7d990fa167 Clarify how only_if works, also combined with with_items
- The old documentation stated not to quote the variable in the function, which is obviously wrong. When using lists or integers, we have to quote otherwise the startswith() method will trip over its non-existence.
- It was unclear that the only_if statement is processed for each item when doing with_items, so I added an example making it crystal clear how this can be used in your advantage (or why a non-existing list variable can break your logic if you expected the only_if to be processed once before running the task)
2012-10-22 12:30:47 +02:00
Michael DeHaan
7e2d6c0050 Clarify first_available_file is only for copy/template 2012-10-20 11:16:05 -04:00
Michael DeHaan
ed9f5eed09 Merge pull request #1338 from alopropoz/extra_vars_override
Vars specified via CLI have the highest priority.
2012-10-20 07:29:12 -07:00
Michael DeHaan
31b45479e8 When using delegation, local_action should always use the local connection type. 2012-10-18 20:18:33 -04:00
Michael DeHaan
e59f5d609b Merge pull request #1373 from jpmens/who1
Addition to WhoUses + typo fix
2012-10-18 16:57:50 -07:00
Serge van Ginderachter
d04bd04f80 typo in handlers example yaml 2012-10-18 14:35:35 +02:00
Jan-Piet Mens
b6eacd1631 Addition to WhoUses + typo fix 2012-10-18 14:03:22 +02:00
Michael DeHaan
21b1e6c5a4 Add who uses ansible page back. 2012-10-17 22:28:24 -04:00
Nigel Metheringham
a457d24b97 Added comment about long lines in playbooks
I had trouble finding this information, so though it was worth
adding to docs... but am not sure its easy to find for someone
specifically to find.  At least I think this inclusion matches the
tone of document, but maybe this info should go into a FAQ
instead/as-well?
2012-10-17 15:31:33 +01:00
Michael DeHaan
50abc73bd2 Merge pull request #1353 from jpmens/moduledev1
Indicate module_formatter can produce boilerplate DOCUMENTATION
2012-10-17 05:08:10 -07:00
Jan-Piet Mens
9991dfee6c Indicate module_formatter can produce boilerplate DOCUMENTATION
add ./hacking/
2012-10-17 08:18:39 +02:00
Michael DeHaan
26ee03a43f Searchindex should not be part of source control 2012-10-16 19:14:51 -04:00
Michael DeHaan
2bef84e666 Rebuild docs 2012-10-16 19:14:21 -04:00
Michael DeHaan
97bc11795a more 0.8 docs 2012-10-16 19:12:31 -04:00
Michael DeHaan
0677891fc6 More docs 2012-10-16 19:09:15 -04:00
Michael DeHaan
a98886c77f Further docs hacking 2012-10-16 19:03:54 -04:00
Michael DeHaan
1801ded34d more playbook docs 2012-10-16 18:58:31 -04:00
Michael DeHaan
ca261e8961 more 0.8 documenting 2012-10-16 18:51:10 -04:00
Michael DeHaan
63100c9bc0 Docs + fix variable precedence of environment variables (ok, ok, I give in!) 2012-10-16 18:40:01 -04:00
Michael DeHaan
95db898cde add docs on fireball 2012-10-16 18:30:18 -04:00
Michael DeHaan
618418a440 RST typo 2012-10-16 18:17:04 -04:00
Michael DeHaan
6f14e35c36 Merge pull request #1335 from phgrau/devel
Use && for executing next command if, and only if, command1 returns an e...
2012-10-16 15:16:46 -07:00
Michael DeHaan
4405244224 Docs rebuild 2012-10-16 18:00:47 -04:00
Aleksej Romanov
c5469f6367 Vars specified via CLI have the highest priority. 2012-10-16 04:34:54 +07:00
Philipp Grau
9b15b5d592 Use && for executing next command if, and only if, command1 returns an exit status of zero. 2012-10-15 16:56:55 +02:00
Michael DeHaan
8dadf8a905 Use 'path' in file documentation, though src/dest work, it's less intuitive. 2012-10-12 22:08:07 -04:00
Michael DeHaan
c5d2f6b0d3 implement lookup plugins for arbitrary enumeration over arbitrary things. See the mailing list for some cool examples. 2012-10-12 20:07:05 -04:00
Michael DeHaan
7644dbe330 Update some examples to explain why notify is not used 2012-10-12 18:12:22 -04:00
Michael DeHaan
621708e976 user module should be using module.BOOLEANS for choices 2012-10-12 18:06:36 -04:00
Michael DeHaan
aa98c84a62 HP and vsphere modules are crazy awesome but I am thinking these belong in contrib not core. 2012-10-12 17:49:48 -04:00
Tim Bielawa
4b04d7a914 Add DOCUMENTATION for module documentation. 2012-10-12 17:22:55 -04:00
Michael DeHaan
6d2f003ceb Update formatter to not include orange blocks all over docsite page 2012-10-10 21:25:19 -04:00
Michael DeHaan
e74b9e1d34 Add .gitdir 2012-10-10 20:00:15 -04:00
Michael DeHaan
b505a3796c Fix docsite example 2012-10-10 19:56:53 -04:00
Michael DeHaan
a873e1a467 Don't check in any module RST files as these are generated too. 2012-10-10 19:48:40 -04:00
Michael DeHaan
110244d7b4 Merge branch 'remove-argparse' of git://github.com/dagwieers/ansible into devel
Conflicts:
	hacking/module_formatter.py

Don't run webdocs build when building packages
2012-10-10 18:46:51 -04:00
Michael DeHaan
8ae9831439 Don't check in docsite static HTML, so folks will know to just edit the RST. 2012-10-10 18:41:50 -04:00
Michael DeHaan
dbeb26ad6d Don't check in modules.js either 2012-10-10 18:41:50 -04:00
Michael DeHaan
bbf95abc8f Merge pull request #1276 from mxxcon/patch-1
Typo in example section for 'setup' module docs.
2012-10-10 05:31:22 -07:00
Michael DeHaan
d5bb7258c8 Working on makefile 2012-10-10 08:03:52 -04:00
mxxcon
6b5f19a796 Typo in example section for 'setup' module. 2012-10-09 20:41:26 -03:00
Michael DeHaan
f32778aa93 Update links to contrib 2012-10-08 08:23:11 -04:00
Michael DeHaan
5c09fd4210 update links to plugins 2012-10-08 08:22:05 -04:00
Michael DeHaan
4a95194424 Docs rebuild in new project structure. 2012-10-08 08:09:27 -04:00
Michael DeHaan
87d9eeae57 Remove unused graphics 2012-10-08 07:49:00 -04:00
Michael DeHaan
d6e4b1bf5b Subtree merge of ansible-docs 2012-10-08 07:44:38 -04:00