From 10dc5ae8768618c50f7a5b2d0df4696cc6c1e47d Mon Sep 17 00:00:00 2001 From: trbs Date: Thu, 13 Jun 2013 23:09:22 +0200 Subject: [PATCH 1/2] minor fix, path name of ansible.cfg in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67498069a96..6167d7edd30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -449,7 +449,7 @@ Highlighted Core Changes: Other Core Changes: -* ansible config file can also go in '.ansible.cfg' in cwd in addition to ~/.ansible.cfg and /etc/ansible/ansible.cfg +* ansible config file can also go in 'ansible.cfg' in cwd in addition to ~/.ansible.cfg and /etc/ansible/ansible.cfg * fix for inventory hosts at API level when hosts spec is a list and not a colon delimited string * ansible-pull example now sets up logrotate for the ansible-pull cron job log * negative host matching (!hosts) fixed for external inventory script usage From 653fac2f5ce1d90903de121fe7d0ac69d2f0e1f8 Mon Sep 17 00:00:00 2001 From: trbs Date: Thu, 13 Jun 2013 23:13:54 +0200 Subject: [PATCH 2/2] fix loading order of ansible.cfg in documentation --- docsite/latest/rst/examples.rst | 4 ++-- examples/ansible.cfg | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docsite/latest/rst/examples.rst b/docsite/latest/rst/examples.rst index 5edb9a23615..6fa38a4352f 100644 --- a/docsite/latest/rst/examples.rst +++ b/docsite/latest/rst/examples.rst @@ -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: 1. File specified by the ``ANSIBLE_CONFIG`` environment variable -2. ``ansible.cfg`` in the current working directory. (version 0.8 and up) -3. ``~/.ansible.cfg`` +2. ``~/.ansible.cfg`` +3. ``ansible.cfg`` in the current working directory. (version 0.8 and up) 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. diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 6536550c1c5..dc42359fcaf 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -1,6 +1,8 @@ # config file for ansible -- http://ansible.github.com +# # 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]