clear_old_env: do not purge vnstat completly

Freifunk-Dresden · Jan 3, 2024 · 7a7c076 · 7a7c076
1 parent bb0bd7b
commit 7a7c076
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/salt/freifunk/base/clear_old_env.sls b/salt/freifunk/base/clear_old_env.sls
@@ -3,19 +3,8 @@
 remove_old_pkg:
   pkg.removed:
     - names:
-      - vnstat
       - composer
 
-clean_old_vnstat:
-  file.absent:
-    - name: /etc/vnstat.conf
-    - name: /var/lib/vnstat
-    - name: /var/lib/vnstat
-    - name: /opt/vnstat-dashboard
-    - name: /var/www_vnstat/
-    - name: /etc/apache2/conf-available/vnstat.conf
-    - name: /etc/apache2/conf-enabled/vnstat.conf
-
 
 /root/freifunk/vserver-base:
   file.absent
@@ -24,6 +13,12 @@ clean_old_vnstat:
   file.absent
 
 
+/etc/apache2/conf-available/vnstat.conf:
+  file.absent
+
+/etc/apache2/conf-enabled/vnstat.conf:
+  file.absent
+
 /etc/apache2/sites-enabled/001-freifunk.conf:
   file.absent:
     - onlyif: test ! -L /etc/apache2/sites-enabled/001-freifunk.conf
@@ -99,7 +94,6 @@ clean_old_vnstat:
 /etc/nvram.conf:
   file.absent
 
-
 /usr/bin/nvram:
   file.absent
 
@@ -155,9 +149,16 @@ clean_old_vnstat:
   file.absent
 
 
+/opt/vnstat-dashboard:
+  file.absent
+
+
 /var/statistic:
   file.absent
 
 /var/www_freifunk/robots.txt:
   file.absent:
     - onlyif: grep -q '# Alle Robots' /var/www_freifunk/robots.txt
+
+/var/www_vnstat:
+  file.absent