users: manage ssh authorised keys

Signed-off-by: Joe Groocock <me@frebib.net>

pillar/top.sls

@@ -1,3 +0,0 @@
-{{ saltenv }}:
-  '*':
-    []

stack/stack.cfg

@@ -1 +0,0 @@
-[]

states/salt/minion/init.sls

@@ -11,10 +11,10 @@ salt-minion:
 
 restart-salt-minion:
   cmd.run:
-  - name: sleep 10 && systemctl restart salt-minion
+  - name: "sleep 10 && systemctl restart salt-minion --no-block"
   - bg: true
   - order: last
-  - onchanges:
+  - watch:
     - pkg: salt-minion
     - file: /etc/salt/minion
   - require:
@@ -34,7 +34,6 @@ restart-salt-minion:
 
 check-minion-config:
   cmd.run:
-  - name: sudo salt-call --local --skip-grains test.true
-  - onchanges:
-    - pkg: salt-minion
+  - name: sudo salt-call --local --skip-grains test.ping
+  - watch:
     - file: /etc/salt/minion

states/users/init.sls

@@ -18,7 +18,7 @@
   {%- endif %}
   ssh_auth.manage:
   - user: {{ name }}
-  {%- if user['ssh-keys'] is defined %}
-  - ssh_keys: {{ user['ssh-keys']|json }}
+  {%- if user.ssh-keys is defined %}
+  - ssh_keys: {{ user.ssh-keys|json }}
   {%- endif %}
 {%- endfor %}

states/users/users.jinja

@@ -4,9 +4,6 @@
   {%- do admin_groups.append('systemd-journal') %}
 {%- endif %}
 
-{# FIXME(frebib): manage Docker group instead of blindly adding it #}
-{%- do admin_groups.append('docker') %}
-
 frebib:
   groups:
 {%- for group in admin_groups %}