From bf89cb7c655e428ddc17b49d9cf0837748f53e63 Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Sat, 3 Dec 2022 00:04:04 +0100
Subject: [PATCH] updated salt_minion state

---
 states/salt_minion/config.sls             |  2 +-
 states/salt_minion/defaults.yaml          | 18 +++++++++---------
 states/salt_minion/salt-minion.service.j2 |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/states/salt_minion/config.sls b/states/salt_minion/config.sls
index 2904b65..3d973a0 100644
--- a/states/salt_minion/config.sls
+++ b/states/salt_minion/config.sls
@@ -4,7 +4,7 @@ salt-minion-config:
   file.managed:
     - name: /etc/salt/minion
     - source: salt://salt_minion/minion.j2
-    - template: jinja
     - user: root
     - group: root
     - mode: 640
+    - template: jinja
diff --git a/states/salt_minion/defaults.yaml b/states/salt_minion/defaults.yaml
index 3f3a937..fc44ffc 100644
--- a/states/salt_minion/defaults.yaml
+++ b/states/salt_minion/defaults.yaml
@@ -4,12 +4,12 @@ salt_minion:
   version: 3005.1
   config:
     master: salt.paulbsd.com
-    ping_interval: 1
-    # hash_type: sha256
-    state_verbose: 'True'
-    tcp_keepalive: 'True'
-    tcp_keepalive_idle: 300
-    random_reauth_delay: 60
-    recon_default: 1000
-    recon_max: 10000
-    recon_randomize: 'True'
+    #ping_interval: 1
+    ## hash_type: sha256
+    #state_verbose: 'True'
+    #tcp_keepalive: 'True'
+    #tcp_keepalive_idle: 300
+    #random_reauth_delay: 60
+    #recon_default: 1000
+    #recon_max: 10000
+    #recon_randomize: 'True'
diff --git a/states/salt_minion/salt-minion.service.j2 b/states/salt_minion/salt-minion.service.j2
index d91854b..36e1cce 100644
--- a/states/salt_minion/salt-minion.service.j2
+++ b/states/salt_minion/salt-minion.service.j2
@@ -6,11 +6,11 @@ After=network.target
 
 [Service]
 Type=notify
-KillMode=process
+KillMode=control-group
 NotifyAccess=all
 LimitNOFILE=8192
 ExecStart=/usr/local/bin/salt-minion
-TimeoutStopSec=10s
+TimeoutStopSec=5s
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file