From 61a216de81cf36329015d08292a9dcba02089b7a Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Tue, 20 Aug 2013 16:51:13 -0500
Subject: [PATCH] fleshed out template

---
 pillar.example        |  6 +++---
 sudoers/files/sudoers | 28 +++++++++++++++++++---------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pillar.example b/pillar.example
index f68a70b..89c5389 100644
--- a/pillar.example
+++ b/pillar.example
@@ -9,17 +9,17 @@ sudoers:
     - secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
   aliases:
     hosts:
-      - WEBSERVERS:
+      WEBSERVERS:
         - www1
         - www2
         - www3
     users:
-      - ADMINS:
+      ADMINS:
         - millert
         - dowdy
         - mikef
     commands:
-      - PROCESSES:
+      PROCESSES:
         - /usr/bin/nice
         - /bin/kill
         - /usr/bin/renice
diff --git a/sudoers/files/sudoers b/sudoers/files/sudoers
index e93bd35..4abcfc7 100644
--- a/sudoers/files/sudoers
+++ b/sudoers/files/sudoers
@@ -1,10 +1,10 @@
 {% set sudoers = pillar.get('sudoers', {}) %}
 {% set defaults = sudoers.get('defaults', []) %}
 {% set aliases = sudoers.get('aliases', {}) %}
-{% set host_aliases = aliases.get('hosts', []) %}
-{% set user_aliases = aliases.get('users', []) %}
-{% set cmnd_aliases = aliases.get('commands', []) %}
-{% set runas_aliases = aliases.get('runas', []) %}
+{% set host_aliases = aliases.get('hosts', {}) %}
+{% set user_aliases = aliases.get('users', {}) %}
+{% set command_aliases = aliases.get('commands', {}) %}
+{% set runas_aliases = aliases.get('runas', {}) %}
 {% set users = sudoers.get('users', {}) %}
 {% set groups = sudoers.get('groups', {}) %}
 {% set includedir = sudoers.get('includedir', None) %}
@@ -22,19 +22,29 @@ Host_Alias {{ name }} = {{ ",".join(hosts) }}
 {% endfor %}
 
 # User alias specification
-{{ user_aliases }}
+{% for name,users in user_aliases.items() %}
+User_Alias {{ name }} = {{ ",".join(users) }}
+{% endfor %}
 
 # Cmnd alias specification
-{{ cmnd_aliases }}
+{% for name,commands in command_aliases.items() %}
+Cmnd_Alias {{ name }} = {{ ",".join(commands) }}
+{% endfor %}
 
 # Runas alias specification
-{{ runas_aliases }}
+{% for name,runas in runas_aliases.items() %}
+Runas_Alias {{ name }} = {{ ",".join(runas) }}
+{% endfor %}
 
 # User privilege specification
-{{ users }}
+{% for user,spec in users %}
+{{ user }} {{ spec }}
+{% endfor %}
 
 # Group privilege specification
-{{ groups }}
+{% for group,spec in groups %}
+%{{ group }} {{ spec }}
+{% endfor %}
 
 {% if includedir %}
 includedir {{ includedir }}