Manage salt-minion package, service and config

Restart the service after upgrading the package or modifying the minion
configuration file.

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

states/salt/minion/init.sls

@@ -10,11 +10,11 @@ salt-minion:
     - file: /etc/salt/minion
 
 restart-salt-minion:
-  cmd.run:
-  - name: sleep 10 && systemctl restart salt-minion
-  - bg: true
+  service.restart:
+  - name: salt-minion
   - order: last
-  - onchanges:
+  - no_block: true
+  - watch:
     - pkg: salt-minion
     - file: /etc/salt/minion
   - require:
@@ -22,8 +22,7 @@ restart-salt-minion:
 
 /etc/salt/minion:
   file.managed:
-  - source: salt://{{ slspath }}/templates/minion.jinja
-  - template: jinja
+  - source: salt://{{ slspath }}/minion.jinja
   - user: root
   - group: root
   - mode: 644
@@ -34,7 +33,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/salt/minion/templates/minion

@@ -1,4 +1,4 @@
-id: {{ grains.id|lower }}
+id: {{ minion_id }}
 log_level: info
 ipv6: true
 ssl: true

states/users/init.sls

@@ -16,9 +16,4 @@
   {%- 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,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 %}
@@ -15,7 +12,6 @@ frebib:
   ssh-keys:
   - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINk+sOUEXKsGqITyMhna9v77ADGagkr3YMpgZFkrvqcd frebib@frebib-PC
   - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIGxhZPQM/3Ck+DNNM0CoIZTsvKqQLKq8fqQoO6fXzX frebib@frebib-OnePlus3
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+T8ChEU9YmpE2BY77oEtKzedB8HWDSM5bErDN9gcvj frebib@frebib-Cf
 
 adam:
   groups: