Merge pull request #1496 from Security-Onion-Solutions/issue/1489

move salt master config file, copy salt-master service file and enabl…
Security-Onion-Solutions · Oct 9, 2020 · 930ec33 · 930ec33
2 parents 336400e + 6172268
commit 930ec33
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/files/master → files/salt/master/master b/files/master → files/salt/master/master
diff --git a/files/salt/master/salt-master.service b/files/salt/master/salt-master.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=The Salt Master Server
+Documentation=man:salt-master(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html
+After=network.target
+
+[Service]
+LimitNOFILE=100000
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/bin/salt-master
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/setup/so-functions b/setup/so-functions
@@ -593,12 +593,15 @@ copy_salt_master_config() {
 
 	# Copy the Salt master config template to the proper directory
 	if [ "$setup_type" = 'iso' ]; then
-		cp /root/SecurityOnion/files/master /etc/salt/master >> "$setup_log" 2>&1
+		cp /root/SecurityOnion/files/salt/master/master /etc/salt/master >> "$setup_log" 2>&1
+		cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service >> "$setup_log" 2>&1
 	else
-		cp ../files/master /etc/salt/master >> "$setup_log" 2>&1
+		cp ../files/salt/master/master /etc/salt/master >> "$setup_log" 2>&1
+		cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service >> "$setup_log" 2>&1
 	fi
 
 	# Restart the service so it picks up the changes
+	systemctl daemon-reload >> "$setup_log" 2>&1
 	systemctl restart salt-master >> "$setup_log" 2>&1
 }