From 14584b28e1812c7c67a7ba97899eead9ad15ba56 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 29 Jul 2020 16:04:47 -0400
Subject: [PATCH] include salt state in salt.minion, manager salt-minion
 service in salt.minion state;

---
 salt/salt/init.sls   | 9 +--------
 salt/salt/minion.sls | 9 ++++++++-
 salt/top.sls         | 2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index ca08aab78..2caae81cd 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -1,20 +1,13 @@
-
-
 {% if grains['os'] != 'CentOS' %}    
 saltpymodules:
   pkg.installed:
     - pkgs:
       - python-docker
       - python-m2crypto
-  {% endif %}
+{% endif %}
 
 salt_bootstrap:
   file.managed:
     - name: /usr/sbin/bootstrap-salt.sh
     - source: salt://salt/scripts/bootstrap-salt.sh
     - mode: 755
-
-salt_minion_service:
-  service.running:
-    - name: salt-minion
-    - enable: True
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 8e7766738..331efbc53 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -1,4 +1,6 @@
-#Future state for Salt minions
+include:
+  - salt
+  
 {% import_yaml 'salt/minion.defaults.yaml' as salt %}
 {% set saltversion = salt.salt.minion.version %}
 
@@ -10,3 +12,8 @@ install_salt_minion:
     {% else %}
     - name: echo 'Already running Salt Minon version {{ saltversion }}'
     {% endif %}
+
+salt_minion_service:
+  service.running:
+    - name: salt-minion
+    - enable: True
diff --git a/salt/top.sls b/salt/top.sls
index b5669ff32..599f67dca 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -24,7 +24,7 @@ base:
 
   '* and G@saltversion:{{saltversion}}':
     - match: compound
-    - salt
+    - salt.minion
     - docker
     - patch.os.schedule
     - motd