switching vps to be the icinga master

2023-12-09 18:49:30 -05:00
parent 1333c3e4a0
commit fa41a5bfd3
8 changed files with 166 additions and 100 deletions
--- a/top.sls
+++ b/top.sls
@@ -1,4 +1,4 @@
-{{saltenv}}:
+{{ saltenv }}:
  '*':
    - salt
    - common
@@ -7,16 +7,17 @@
   or salt.pillar.get('restic:server', None) is not none %}
    - restic
 {% endif %}
-{% if salt.pillar.get("icinga2:ssh_client", None) is not none %}
-    - icinga2.ssh_client
+{% if salt.pillar.get("icinga2:ssh_client", None) is not none
+   or salt.pillar.get("icinga2:server", None) is not none %}
+    - icinga2
+{% endif %}
+{% if salt.pillar.get("gitea", None) is not none %}
+    - gitea
 {% endif %}
  '*.keiran.us':
    - firewall
    - resolvers
-  'vps47492.inmotionhosting.com':
-    - gitea
  'kpi.keiran.us':
-    - icinga2.server
    - nginx
    - restic
    - samba