add ansible.cfg; reorganize inventory a bit

.gitignore

@@ -1,6 +1,4 @@
 /inventory/*
-!/inventory/.gitkeep
-!/inventory/host_vars/.gitkeep
 
 # ignore roles pulled by ansible-galaxy
 /roles/galaxy/*

ansible.cfg

@@ -0,0 +1,29 @@
+[defaults]
+forks = 50
+timeout = 86400
+strategy = linear
+ansible_managed = Autogenerated file, do NOT edit manually.
+retry_files_enabled = False
+
+# Paths
+inventory = inventory/hosts
+roles_path = roles
+log_path = /tmp/mash.log
+
+# Remote default
+remote_user = root
+host_key_checking = False
+
+# Display
+display_skipped_hosts = False
+
+# Facts
+gathering = smart
+fact_caching = jsonfile
+fact_caching_connection=/tmp/mash
+
+
+[ssh_connection]
+pipelining = True
+ssh_args = -C -o ControlMaster=auto -o ControlPersist=30m -o PreferredAuthentications=publickey
+control_path = /tmp/mash/ssh-%%h-%%p-%%r

docs/configuring-playbook.md

@@ -7,7 +7,7 @@ To configure the playbook, you need to have done the following things:
 
 You can then follow these steps inside the playbook directory:
 
-1. create a directory to hold your configuration (`mkdir inventory/host_vars/<your-domain>`)
+1. create a directory to hold your configuration (`mkdir -p inventory/host_vars/<your-domain>`)
 
 2. copy the sample configuration file (`cp examples/vars.yml inventory/host_vars/<your-domain>/vars.yml`)