From 923fe8ff5013fffba785e3e2f9eddc896a36b90e Mon Sep 17 00:00:00 2001
From: Vladimir Still <git@vstill.eu>
Date: Thu, 1 Dec 2022 10:10:39 +0100
Subject: [PATCH] Move dfwatch journal-checker into absible to allow templating
them
---
ansible/roles/common_deb/tasks/main.yml | 4 ++--
bin/dfwatch => ansible/roles/common_deb/templates/dfwatch.j2 | 3 ++-
.../roles/common_deb/templates/journal-checker.j2 | 0
3 files changed, 4 insertions(+), 3 deletions(-)
rename bin/dfwatch => ansible/roles/common_deb/templates/dfwatch.j2 (89%)
rename bin/journal-checker => ansible/roles/common_deb/templates/journal-checker.j2 (100%)
diff --git a/ansible/roles/common_deb/tasks/main.yml b/ansible/roles/common_deb/tasks/main.yml
index bb08d80..4d6ef7b 100644
--- a/ansible/roles/common_deb/tasks/main.yml
+++ b/ansible/roles/common_deb/tasks/main.yml
@@ -362,8 +362,8 @@
groups: ["systemd-journal"]
- name: "Journal checker"
- copy:
- src: "../bin/{{item}}"
+ template:
+ src: "{{item}}.j2"
dest: "/usr/bin/{{item}}"
mode: "u=rx,g=rx,o=rx"
loop:
diff --git a/bin/dfwatch b/ansible/roles/common_deb/templates/dfwatch.j2
similarity index 89%
rename from bin/dfwatch
rename to ansible/roles/common_deb/templates/dfwatch.j2
index 2b51e04..f44fec9 100755
--- a/bin/dfwatch
+++ b/ansible/roles/common_deb/templates/dfwatch.j2
@@ -3,6 +3,7 @@
DFFILT="-x tmpfs -x devtmpfs -l"
FSFILT='\(/mnt/xstill\)'
MAIL=mail
+MAIL_TO={{admin_email}}
if ! which $MAIL >&/dev/null; then
MAIL=bsd-mailx
fi
@@ -30,6 +31,6 @@ FULL=$(df --output=pcent,avail,target,size $DFFILT | tail -n+2 | sed -e 's/^[ ]*
done)
if test -n "$FULL"; then
- df -h $DFFILT | $MAIL -s "[DF:$(hostname)] Full: $FULL" xstill@fi.muni.cz
+ df -h $DFFILT | $MAIL -s "[DF:$(hostname)] Full: $FULL" ${MAIL_TO}
exit 1
fi
diff --git a/bin/journal-checker b/ansible/roles/common_deb/templates/journal-checker.j2
similarity index 100%
rename from bin/journal-checker
rename to ansible/roles/common_deb/templates/journal-checker.j2
--
GitLab