From 2f442b1e0d1eed32036a774fd34594a839baca39 Mon Sep 17 00:00:00 2001
From: Forrest Alvarez <forrest@flowroute.com>
Date: Wed, 18 Jun 2014 13:39:31 -0700
Subject: [PATCH] Added authorized_keys template, update init for support.

---
 users/files/authorized_keys.jinja |  6 ++++++
 users/init.sls                    | 15 ++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 users/files/authorized_keys.jinja

diff --git a/users/files/authorized_keys.jinja b/users/files/authorized_keys.jinja
new file mode 100644
index 0000000..3ffb528
--- /dev/null
+++ b/users/files/authorized_keys.jinja
@@ -0,0 +1,6 @@
+{% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
+
+{% for auth in user['ssh_auth'] %}
+ssh_auth_{{ name }}_{{ loop.index0 }} {{ auth }}
+{% endfor %}
+{% endfor %}
diff --git a/users/init.sls b/users/init.sls
index a3440ff..c6349ef 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -112,17 +112,14 @@ user_{{ name }}_public_key:
       {% endfor %}
   {% endif %}
 
-
 {% if 'ssh_auth' in user %}
-{% for auth in user['ssh_auth'] %}
-ssh_auth_{{ name }}_{{ loop.index0 }}:
-  ssh_auth.present:
+file.managed:
+    - name: /home/{{ name }}/.ssh/authorized_keys
+    - source: salt://users/files/authorized_keys.jinja
     - user: {{ name }}
-    - name: {{ auth }}
-    - require:
-        - file: {{ name }}_user
-        - user: {{ name }}_user
-{% endfor %}
+    - group: {{ name }}
+    - mode: 644
+    - template: jinja
 {% endif %}