up2date

common/map.jinja

@@ -27,7 +27,6 @@
 
 {% set defaults = {
   'packages': [
-    'iftop',
     'iotop',
     'nano',
     'screen',

galera/init.sls

@@ -0,0 +1,28 @@
+mariadb:
+  pkgrepo.managed:
+    - name: mariadb
+    - humanname: MariaDB
+    - baseurl: https://rpm.mariadb.org/10.6/rhel/$releasever/$basearch
+    - gpgkey: https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
+    - gpgcheck: 1
+
+galera:
+  pkg.installed:
+    - pkgs:
+      - MariaDB-server
+      - MariaDB-client
+      - galera-4
+    - require:
+      - pkgrepo: mariadb
+
+mariadb_service:
+  service.running:
+    - name: mariadb
+    - enable: true
+
+/root/.my.cnf:
+  file.managed:
+    - replace: false
+    - user: root
+    - group: root
+    - mode: 600

salt/files/salt-master.service

@@ -6,7 +6,7 @@ After=network.target
 LimitNOFILE=100000
 Type=notify
 NotifyAccess=all
-ExecStart=/usr/local/bin/salt-master
+ExecStart=/opt/salt/bin/salt-master
 
 [Install]
 WantedBy=multi-user.target

salt/files/salt-minion.service

@@ -7,7 +7,7 @@ KillMode=process
 Type=notify
 NotifyAccess=all
 LimitNOFILE=8192
-ExecStart=/usr/local/bin/salt-minion
+ExecStart=/opt/salt/bin/salt-minion
 
 [Install]
 WantedBy=multi-user.target

salt/master.sls

@@ -29,4 +29,6 @@ salt-master:
     - require:
       - file: /lib/systemd/system/salt-minion.service
       - cmd: systemd reload for salt-master
+    - watch:
+      - pip: salt
 

salt/minion.sls

@@ -20,6 +20,8 @@ salt-minion:
     - require:
       - file: /lib/systemd/system/salt-minion.service
       - module: systemd reload for salt-minion
+    - watch:
+      - pip: salt
 
 /etc/salt/minion:
   file.managed:

salt/update.sls

@@ -1,4 +1,13 @@
-#salt:
+pip:
-#  pip.installed:
+  pip.installed:
-#    - user: root
+    - pip_bin: /opt/salt/bin/pip3
-#    - upgrade: true
+    - user: root
+    - upgrade: true
+
+salt:
+  pip.installed:
+    - name: salt == 3005.1
+    - pip_bin: /opt/salt/bin/pip3
+    - user: root
+    - require:
+      - pip: pip

top.sls

@@ -15,6 +15,8 @@
     - resolv
   'vps47492.inmotionhosting.com':
     - gitea
+  'cent7-vm*.keiran.us':
+    - galera
   'kpi.keiran.us':
     - salt.master
     - icinga2