From 539ef686f7e3a98e35b77c2f8b88afecd5b2b8c8 Mon Sep 17 00:00:00 2001
From: root <root@kpi.keiran.us>
Date: Sat, 13 Feb 2021 19:23:23 -0500
Subject: [PATCH] add salt unit files, fix master inside nat

---
 salt/files/minion.jinja        |  8 +++++++-
 salt/files/salt-master.service | 12 ++++++++++++
 salt/files/salt-minion.service | 13 +++++++++++++
 salt/master.sls                | 23 +++++++++++++++++++++++
 salt/minion.sls                | 24 +++++++++++++++++++++++-
 salt/update.sls                |  4 ++++
 6 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 salt/files/salt-master.service
 create mode 100644 salt/files/salt-minion.service
 create mode 100644 salt/update.sls

diff --git a/salt/files/minion.jinja b/salt/files/minion.jinja
index 6f567b3..cde0e2d 100644
--- a/salt/files/minion.jinja
+++ b/salt/files/minion.jinja
@@ -1,5 +1,11 @@
+{% if grains.ip4_gw == '192.168.1.1' %}
 master: 192.168.1.9
+{% else %}
+master: kpi.keiran.us
+{% endif %}
+pillar_raise_on_missing: True
 state_output: changes
-log_level: error
+log_level: warning
 grains_cache: True
+pillar_merge_lists: True
 mysql.default_file: '/root/.my.cnf'
diff --git a/salt/files/salt-master.service b/salt/files/salt-master.service
new file mode 100644
index 0000000..194cfc9
--- /dev/null
+++ b/salt/files/salt-master.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Salt Master Server
+After=network.target
+
+[Service]
+LimitNOFILE=100000
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/local/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/salt/files/salt-minion.service b/salt/files/salt-minion.service
new file mode 100644
index 0000000..1aaa672
--- /dev/null
+++ b/salt/files/salt-minion.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=The Salt Minion
+After=network.target salt-master.service
+
+[Service]
+KillMode=process
+Type=notify
+NotifyAccess=all
+LimitNOFILE=8192
+ExecStart=/usr/local/bin/salt-minion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/salt/master.sls b/salt/master.sls
index b25a2ea..cf71575 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -1,3 +1,6 @@
+include:
+  - salt.update
+  - salt.minion
 
 /etc/salt/master:
   file.managed:
@@ -7,3 +10,23 @@
     - group: root
     - mode: 644
 
+/lib/systemd/system/salt-master.service:
+  file.managed:
+    - source: salt://salt/files/salt-master.service
+    - user: root
+    - group: root
+    - mode: 644
+
+systemd reload for salt-master:
+  cmd.run:
+    - name: systemctl daemon-reload
+    - onchanges:
+      - file: /lib/systemd/system/salt-master.service
+
+salt-master:
+  service.running:
+    - enable: true
+    - require:
+      - file: /lib/systemd/system/salt-minion.service
+      - cmd: systemd reload for salt-master
+
diff --git a/salt/minion.sls b/salt/minion.sls
index 2f9c1c2..95cb4de 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -1,7 +1,29 @@
+include:
+  - salt.update
+
+/lib/systemd/system/salt-minion.service:
+  file.managed:
+    - source: salt://salt/files/salt-minion.service
+    - user: root
+    - group: root
+    - mode: 644
+
+systemd reload for salt-minion:
+  module.run:
+    - name: service.systemctl_reload
+    - onchanges:
+      - file: /lib/systemd/system/salt-minion.service
+
+salt-minion:
+  service.running:
+    - enable: true
+    - require:
+      - file: /lib/systemd/system/salt-minion.service
+      - module: systemd reload for salt-minion
 
 /etc/salt/minion:
   file.managed:
-    - source: 'salt://salt/files/minion.jinja'
+    - source: salt://salt/files/minion.jinja
     - template: jinja
     - user: root
     - group: root
diff --git a/salt/update.sls b/salt/update.sls
new file mode 100644
index 0000000..f47730f
--- /dev/null
+++ b/salt/update.sls
@@ -0,0 +1,4 @@
+salt:
+  pip.installed:
+    - user: root
+    - upgrade: true