From aac39a2e21feb2d81440532d6fa239a2953a5385 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Mon, 27 Mar 2017 16:44:09 +0200
Subject: [PATCH] Simplify vault password handling

---
 .gitignore  |  1 +
 README.md   | 10 +++++++---
 ansible.cfg | 11 +++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 ansible.cfg

diff --git a/.gitignore b/.gitignore
index b36779c..9580ccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .vault_pass
+site.retry
diff --git a/README.md b/README.md
index 2b9d688..c620a68 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 Ansible Freifunk Regensburg
 ===========================
 
+## Requirements
+
+The vault password must be stored in `.vault_pass`.
+
+
 ## Running Ansible
-To deploy all defined roles on all servers simply run `ansible-playbook --ask-vault-pass -i hosts site.yml`.
-To deploy only one server run `ansible-playbook -i "imac1-local," site.yml` (--ask-vault-pass is currently only required on the confluence host).
 
+To deploy all defined roles on all servers simply run `ansible-playbook site.yml`.
+To deploy only one server run `ansible-playbook -i "hostname," site.yml`.
 
-TBA
 
 ## Notes
 
diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 0000000..5cb96f2
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,11 @@
+[defaults]
+ansible_managed = This file is managed by ansible, do not make manual changes - they may be overridden at any time.
+inventory       = ./hosts
+library         = ./library
+nocows          = 1
+remote_user     = root
+roles_path      = ./roles
+vault_password_file = ./.vault_pass
+
+[ssh_connection]
+pipelining      = true