fix loading order of ansible.cfg in documentation

This commit is contained in:
trbs 2013-06-13 23:13:54 +02:00
parent 10dc5ae876
commit 653fac2f5c
2 changed files with 5 additions and 3 deletions

View file

@ -259,8 +259,8 @@ Ansible has an optional configuration file that can be used to tune settings and
the first config file it finds present: the first config file it finds present:
1. File specified by the ``ANSIBLE_CONFIG`` environment variable 1. File specified by the ``ANSIBLE_CONFIG`` environment variable
2. ``ansible.cfg`` in the current working directory. (version 0.8 and up) 2. ``~/.ansible.cfg``
3. ``~/.ansible.cfg`` 3. ``ansible.cfg`` in the current working directory. (version 0.8 and up)
4. ``/etc/ansible/ansible.cfg`` 4. ``/etc/ansible/ansible.cfg``
For those running from source, a sample configuration file lives in the examples/ directory. The RPM will install configuration into /etc/ansible/ansible.cfg automatically. For those running from source, a sample configuration file lives in the examples/ directory. The RPM will install configuration into /etc/ansible/ansible.cfg automatically.

View file

@ -1,6 +1,8 @@
# config file for ansible -- http://ansible.github.com # config file for ansible -- http://ansible.github.com
#
# nearly all parameters can be overridden in ansible-playbook or with command line flags # nearly all parameters can be overridden in ansible-playbook or with command line flags
# ansible will read ~/.ansible.cfg or /etc/ansible/ansible.cfg, whichever it finds first # ansible will read ~/.ansible.cfg, ansible.cfg in the current working directory or
# /etc/ansible/ansible.cfg, whichever it finds first
[defaults] [defaults]