From bfd9ac578ed839b93c1735e79eadffc300c4dc82 Mon Sep 17 00:00:00 2001
From: Quotengrote <38253905+quotengrote@users.noreply.github.com>
Date: Fri, 9 Oct 2020 20:11:53 +0200
Subject: [PATCH] Revert "Scripte +  RegEx (#38)" (#39)

This reverts commit 1cbdcbd0d6b801dc031b4fcf063bc657e5ccb71e.
---
 inventories/group_vars/k8s.yml                |  6 -----
 inventories/group_vars/virt.yml               | 24 +------------------
 inventories/k8s                               |  7 ------
 .../templates/systemtemps.sh                  |  2 +-
 roles/mgrote.zfs_tools/templates/zfs-free.sh  |  2 +-
 5 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 inventories/group_vars/k8s.yml
 delete mode 100644 inventories/k8s

diff --git a/inventories/group_vars/k8s.yml b/inventories/group_vars/k8s.yml
deleted file mode 100644
index f3a68e03..00000000
--- a/inventories/group_vars/k8s.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-  ### oefenweb.ufw
-  ufw_rules:
-    - rule: allow
-      to_port: ''
-      comment: 'allow all traffic'
diff --git a/inventories/group_vars/virt.yml b/inventories/group_vars/virt.yml
index fe11a9af..cf820cbf 100644
--- a/inventories/group_vars/virt.yml
+++ b/inventories/group_vars/virt.yml
@@ -1,27 +1,5 @@
 ---
-  ### mgrote.install_packages
-  programs_common:
-    - locales
-    - build-essential
-    - ntp
-    - htop
-    - git
-    - dnsutils
-    - nano
-    - mc
-    - cifs-utils
-    - netdiscover
-    - tree
-    - curl
-    - logrotate
-    - ncdu
-    - net-tools
-    - sysstat
-    - apt-transport-https
-    - neofetch
-    - ntpdate
-    - acl
-    - ifupdown2
+
   ### mgrote.dotfiles
   dotfiles_local_repo_directory: "/root/dotfiles-repo"
   dotfiles_user: "root"
diff --git a/inventories/k8s b/inventories/k8s
deleted file mode 100644
index 32ec6548..00000000
--- a/inventories/k8s
+++ /dev/null
@@ -1,7 +0,0 @@
-all:
-  children:
-    k8s:
-      hosts:
-        k8s-1.grote.lan:
-        k8s-2.grote.lan:
-        k8s-3.grote.lan:
diff --git a/roles/mgrote.install_packages/templates/systemtemps.sh b/roles/mgrote.install_packages/templates/systemtemps.sh
index 2a5abf23..449ad12c 100644
--- a/roles/mgrote.install_packages/templates/systemtemps.sh
+++ b/roles/mgrote.install_packages/templates/systemtemps.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo ipmitool sensor | cut --delimiter '|' -f 1-3 | grep -i "degrees" | sort -k2 -r | tr --delete "|" | tr --squeeze-repeats " " | sed -r 's/(degrees C)/°C/g;s/([[:alnum:]]+[[:space:]][[:alpha:]]+ )([[:digit:]]+\.[[:digit:]]+ )(°C)/\2\t\3\t\1/g'
+watch --interval 10 --differences --color --no-title "ipmitool sensor | cut -d '|' -f 1-3 | grep -i "degrees" | sort -k2 -r | sed -r 's/degrees C/°C/'"
diff --git a/roles/mgrote.zfs_tools/templates/zfs-free.sh b/roles/mgrote.zfs_tools/templates/zfs-free.sh
index d4f45ad8..3f0be813 100644
--- a/roles/mgrote.zfs_tools/templates/zfs-free.sh
+++ b/roles/mgrote.zfs_tools/templates/zfs-free.sh
@@ -1,2 +1,2 @@
 #! /bin/bash
-watch --interval 60 --differences --color --no-title "sudo zfs list -o space | grep -v / | tr -s ' ' | cut --delimiter=' '  --fields=1-3 | sed -r 's/\s/\t\t/g;s/NAME/NAME\t/g'"
+watch --interval 60 --differences --color --no-title "zfs list -o space | grep -v /"