restic formula rewrite and gitea updates

2023-11-26 21:56:18 -05:00
parent 0bb12fde34
commit 3de878dd20
13 changed files with 154 additions and 84 deletions
--- a/top.sls
+++ b/top.sls
@@ -1,22 +1,19 @@
 {{saltenv}}:
  '*':
    - common
-    - users
    - salt
 {% if salt.pillar.get('restic', None) is not none %}
-#    - restic.client
+    - restic
 {% endif %}
-  'fen.keiran.us':
-    - workstation
-  'pawbs.keiran.us':
-    - workstation
  '*.keiran.us':
+    - users
    - firewall
    - resolv
  'vps47492.inmotionhosting.com':
+    - users
    - gitea
  'kpi.keiran.us':
    - icinga2
    - nginx
-#    - restic.server
+    - restic
    - samba