From fed5aee5a2ce88084ada38f8a11404fe213e18f0 Mon Sep 17 00:00:00 2001
From: nb <none@nowhere.nw>
Date: Mon, 3 Jun 2019 15:50:54 +1100
Subject: [PATCH] fix(ssh-dirs): manage ssh keys directories

---
 rundeck/config.sls | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/rundeck/config.sls b/rundeck/config.sls
index 85708e9..b91e900 100644
--- a/rundeck/config.sls
+++ b/rundeck/config.sls
@@ -15,7 +15,7 @@ rundeck.config:
         - source: {{ rundeck_config }}
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '640'
+        - mode: '0640'
         - template: jinja
 
 {% if rundeck_settings.realm.source_path is defined %}
@@ -30,7 +30,7 @@ rundeck.realm:
         - source: {{ rundeck_realm }}
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '640'
+        - mode: '0640'
         - template: jinja
 
 {% if 'framework' in rundeck_settings %}
@@ -46,7 +46,7 @@ rundeck.framework:
         - source: {{ rundeck_framework }}
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '640'
+        - mode: '0640'
         - template: jinja
 
 {% endif %}
@@ -64,7 +64,7 @@ rundeck.profile:
         - source: {{ rundeck_profile }}
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '640'
+        - mode: '0640'
         - template: jinja
 
 {% endif %}
@@ -82,7 +82,7 @@ rundeck.login:
         - source: {{ rundeck_login }}
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '640'
+        - mode: '0640'
         - template: jinja
 
 {% endif %}
@@ -90,21 +90,33 @@ rundeck.login:
 {% if 'sshkey' in rundeck_settings %}
 {% for dir,dir_options in rundeck_settings.sshkey.items() %}
 
+rundeck.sshkey.{{ dir }}:
+    file.directory:
+        - name: {{ dir }}
+        - user: {{ rundeck_settings.user }}
+        - group: {{ rundeck_settings.group }}
+        - mode: '0700'
+        - makedirs: True
+
 rundeck.sshkey.{{ dir }}.private_key:
     file.managed:
         - name: {{ dir }}/id_rsa
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '600'
+        - mode: '0600'
         - contents_pillar: rundeck:sshkey:{{ dir }}:private
+        - require:
+            - file: rundeck.sshkey.{{ dir }}
 
 rundeck.sshkey.{{ dir }}.public_key:
     file.managed:
         - name: {{ dir }}/id_rsa.pub
         - user: {{ rundeck_settings.user }}
         - group: {{ rundeck_settings.group }}
-        - mode: '644'
+        - mode: '0644'
         - contents_pillar: rundeck:sshkey:{{ dir }}:public
+        - require:
+            - file: rundeck.sshkey.{{ dir }}
 
 {% endfor %}
 {% endif %}