diff --git a/common/map.jinja b/common/map.jinja index 9ae436c..7db4381 100644 --- a/common/map.jinja +++ b/common/map.jinja @@ -27,7 +27,6 @@ {% set defaults = { 'packages': [ - 'iftop', 'iotop', 'nano', 'screen', diff --git a/galera/init.sls b/galera/init.sls new file mode 100644 index 0000000..e683bd3 --- /dev/null +++ b/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 diff --git a/salt/files/salt-master.service b/salt/files/salt-master.service index 194cfc9..c737fa7 100644 --- a/salt/files/salt-master.service +++ b/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 diff --git a/salt/files/salt-minion.service b/salt/files/salt-minion.service index 1aaa672..00cea7e 100644 --- a/salt/files/salt-minion.service +++ b/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 diff --git a/salt/master.sls b/salt/master.sls index cf71575..be215b2 100644 --- a/salt/master.sls +++ b/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 diff --git a/salt/minion.sls b/salt/minion.sls index 95cb4de..6096dd3 100644 --- a/salt/minion.sls +++ b/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: diff --git a/salt/update.sls b/salt/update.sls index e4e697f..925391c 100644 --- a/salt/update.sls +++ b/salt/update.sls @@ -1,4 +1,13 @@ -#salt: -# pip.installed: -# - user: root -# - upgrade: true +pip: + pip.installed: + - pip_bin: /opt/salt/bin/pip3 + - user: root + - upgrade: true + +salt: + pip.installed: + - name: salt == 3005.1 + - pip_bin: /opt/salt/bin/pip3 + - user: root + - require: + - pip: pip diff --git a/top.sls b/top.sls index 446f756..a34f654 100644 --- a/top.sls +++ b/top.sls @@ -15,6 +15,8 @@ - resolv 'vps47492.inmotionhosting.com': - gitea + 'cent7-vm*.keiran.us': + - galera 'kpi.keiran.us': - salt.master - icinga2