salt/minion: only restart salt-minion on config/pkg change

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

states/salt/minion/init.sls

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

states/users/init.sls

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

states/users/users.jinja

@@ -4,6 +4,9 @@
   {%- 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 %}