From 3320299e70aefff06bc0cb68f7e12f4c95b46a31 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Tue, 4 Jul 2017 23:46:43 +0200
Subject: [PATCH 1/5] (Re-)enable pillar users-formula:lookup

---
 pillar.example  | 4 ++++
 users/map.jinja | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pillar.example b/pillar.example
index 14e25e8..c1520b7 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,3 +1,7 @@
+users-formula:
+  lookup:  # override the defauls in map.jinja
+    root_group: root
+
 users:
   ## Minimal required pillar values
   auser:
diff --git a/users/map.jinja b/users/map.jinja
index f81acc4..289f966 100644
--- a/users/map.jinja
+++ b/users/map.jinja
@@ -44,4 +44,4 @@
     'sudo_package': 'sudo',
     'googleauth_package': 'libpam-google-authenticator',
   },
-}, merge=salt['pillar.get']('users:lookup')) %}
+}, merge=salt['pillar.get']('users-formula:lookup')) %}

From 17cbdc44a6b868f47d55f5bd23b2e5cf501874d0 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Wed, 12 Jul 2017 16:56:57 +0200
Subject: [PATCH 2/5] Added users-formula to README.rst

---
 README.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.rst b/README.rst
index 543a712..47d0464 100644
--- a/README.rst
+++ b/README.rst
@@ -51,3 +51,19 @@ This depends on the vim-formula to be installed.
 ---------------
 
 Permits the abitrary management of files. See pillar.example for configuration details.
+
+Overriding default values
+=========================
+
+In order to separate actual user account definitions from configuration the pillar `users-formula` was introduced:
+
+```yaml
+users:
+  myuser:
+    # stuff
+
+users-formula:
+  lookup:
+    root_group: toor
+    shell: '/bin/zsh'
+```

From 886f6afc18caf2553c038b0533f09c221bf9833a Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Wed, 12 Jul 2017 16:58:53 +0200
Subject: [PATCH 3/5] fixed code block in README.rst

---
 README.rst | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 47d0464..346780e 100644
--- a/README.rst
+++ b/README.rst
@@ -57,13 +57,12 @@ Overriding default values
 
 In order to separate actual user account definitions from configuration the pillar `users-formula` was introduced:
 
-```yaml
-users:
-  myuser:
-    # stuff
+.. code-bock:: yaml
+    users:
+      myuser:
+        # stuff
 
-users-formula:
-  lookup:
-    root_group: toor
-    shell: '/bin/zsh'
-```
+    users-formula:
+      lookup:
+        root_group: toor
+        shell: '/bin/zsh'

From 0b705e327ece676ef8c6edb1f44106dbd221fedb Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Wed, 12 Jul 2017 17:00:13 +0200
Subject: [PATCH 4/5] fixed code block in README.rst

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 346780e..d7b17f5 100644
--- a/README.rst
+++ b/README.rst
@@ -58,6 +58,7 @@ Overriding default values
 In order to separate actual user account definitions from configuration the pillar `users-formula` was introduced:
 
 .. code-bock:: yaml
+
     users:
       myuser:
         # stuff

From f005617cd12fa2cb051e3072bde160a95c899763 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Wed, 12 Jul 2017 17:03:31 +0200
Subject: [PATCH 5/5] fixed code block in README.rst

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index d7b17f5..43e32fd 100644
--- a/README.rst
+++ b/README.rst
@@ -55,9 +55,9 @@ Permits the abitrary management of files. See pillar.example for configuration d
 Overriding default values
 =========================
 
-In order to separate actual user account definitions from configuration the pillar `users-formula` was introduced:
+In order to separate actual user account definitions from configuration the pillar ``users-formula`` was introduced:
 
-.. code-bock:: yaml
+.. code-block:: yaml
 
     users:
       myuser: