From 99cd6df882867fc7d8c1388018636ebfd3948286 Mon Sep 17 00:00:00 2001
From: Brian Shumate <brian@brianshumate.com>
Date: Sat, 22 Oct 2016 12:04:37 -0400
Subject: [PATCH] vars and docs

---
 CHANGELOG.md      |  6 ++++++
 README.md         | 24 ++++++++++++++----------
 defaults/main.yml | 38 ++++++++++++++++++++++++++++++++++++++
 version.txt       |  2 +-
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b51c69..a8bde4b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,5 +8,11 @@
 - Update documentation
 
 ## v1.0.2
+
 - Set correct RAM amount in Vagrantfile
 - Rename Vagrant inventory back to cluster_nodes
+
+# v1.0.3
+
+- Move all vars to defaults
+- Documentation updates
diff --git a/README.md b/README.md
index 03f5052c..1daed4c8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # Vault
 
-![](https://travis-ci.org/brianshumate/ansible-vault.svg?branch=master)
+[![Build Status](https://travis-ci.org/brianshumate/ansible-vault.svg?branch=master)](https://travis-ci.org/brianshumate/ansible-vault)
+[![Ansible Galaxy](https://img.shields.io/badge/galaxy-brianshumate.vault-blue.svg)](https://galaxy.ansible.com/brianshumate/vault/)
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/brianshumate/ansible-vault.svg)](http://isitmaintained.com/project/brianshumate/ansible-vault "Average time to resolve an issue")
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/brianshumate/ansible-vault.svg)](http://isitmaintained.com/project/brianshumate/ansible-vault "Percentage of issues still open")
 
 This Ansible role performs a basic [Vault](https://vault.io/) installation,
 including filesystem structure and example configuration.
@@ -21,7 +24,7 @@ software and versions:
 
 ## Role Variables
 
-The role specifies variables in `defaults/main.yml` and `vars/*.yml`.
+The role defines variables in `defaults/main.yml`:
 
 | Name           | Default Value | Description                        |
 | -------------- | ------------- | -----------------------------------|
@@ -47,8 +50,11 @@ The role specifies variables in `defaults/main.yml` and `vars/*.yml`.
 
 ### OS Distribution Variables
 
-The Vault binary works on most Linux platforms and is not distribution
-specific. Some distributions require installation of specific OS packages with different nomenclature, so this role has support for major Linux distributions.
+The `consul` binary works on most Linux platforms and is not distribution
+specific. However, some distributions require installation of specific OS
+packages with different naming, so this role was built with support for
+popular Linux distributions and defines these variables to deal with the
+differences acros distros:
 
 | Name           | Default Value | Description                        |
 | -------------- | ------------- | -----------------------------------|
@@ -71,14 +77,12 @@ specific. Some distributions require installation of specific OS packages with d
 
 ## Dependencies
 
-None
+Ansible requires GNU tar and this role performs some local use of the
+unarchive module, so ensure that your system has `gtar` installed.
 
 ## Example Playbook
 
-
-After you have reviewed and altered any necessary variables, and created a
-host inventory file, basic Vault installation is possible using the
-included `site.yml` playbook example:
+Basic installation is possible using the included `site.yml` playbook:
 
 ```
 ansible-playbook -i hosts site.yml
@@ -106,5 +110,5 @@ BSD
 
 ## Contributors
 
-Special thanks to the folks listed in [CONTRIBUTORS.md](https://github.com/brianshumate/ansible-vault/blob/master/CONTRIBUTORS.md) for their 
+Special thanks to the folks listed in [CONTRIBUTORS.md](https://github.com/brianshumate/ansible-vault/blob/master/CONTRIBUTORS.md) for their
 contributions to this project.
diff --git a/defaults/main.yml b/defaults/main.yml
index 88de11d8..4bf0185c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,3 +21,41 @@ vault_address: "0.0.0.0"
 vault_port: "8200"
 vault_node_name: "{{ inventory_hostname_short }}"
 vault_main_config: "{{ vault_config_path }}/vault_main.hcl"
+
+# CentOS vars
+vault_centos_pkg: "{{ vault_version }}_linux_amd64.zip"
+vault_centos_url: "{{ vault_zip_url }}"
+vault_centos_sha256: "{{ vault_zip_sha256 }}"
+
+vault_centos_os_packages:
+  - libselinux-python
+  - git
+  - unzip
+
+# Debian vars
+vault_debian_pkg: "{{ vault_version }}_linux_amd64.zip"
+vault_debian_url: "{{ vault_zip_url }}"
+vault_debian_sha256: "{{ vault_zip_sha256 }}"
+
+vault_debian_os_packages:
+  - git
+  - unzip
+
+# Red Hat vars
+vault_redhat_pkg: "{{ vault_version }}_linux_amd64.zip"
+vault_redhat_url: "{{ vault_zip_url }}"
+vault_redhat_sha256: "{{ vault_zip_sha256 }}"
+
+vault_redhat_os_packages:
+  - libselinux-python
+  - git
+  - unzip
+
+# Ubuntu vars
+vault_ubuntu_pkg: "{{ vault_version }}_linux_amd64.zip"
+vault_ubuntu_url: "{{ vault_zip_url }}"
+vault_ubuntu_sha256: "{{ vault_zip_sha256 }}"
+
+vault_ubuntu_os_packages:
+  - git
+  - unzip
diff --git a/version.txt b/version.txt
index 570c7965..e946d6bb 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v1.0.2
+v1.0.3