dan/ops-jrz1
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix killswitch paths in watchdog scripts, remove replaceStrings workaround

Browse source
This commit is contained in:
Dan 2026-01-05 09:12:46 -08:00
parent 22f405f995
commit 955b6e91b4
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configuration.nix
View file

@ -14,10 +14,7 @@ let
cpu-watchdog = pkgs.writeShellApplication { cpu-watchdog = pkgs.writeShellApplication {
name = "cpu-watchdog"; name = "cpu-watchdog";
runtimeInputs = with pkgs; [ procps gawk coreutils util-linux killswitch ]; runtimeInputs = with pkgs; [ procps gawk coreutils util-linux killswitch ];
text = builtins.replaceStrings text = builtins.readFile ./scripts/cpu-watchdog;
[ "/usr/local/bin/killswitch" ]
[ "killswitch" ]
(builtins.readFile ./scripts/cpu-watchdog);
}; };
egress-watchdog = pkgs.writeShellApplication { egress-watchdog = pkgs.writeShellApplication {
@ -25,10 +22,7 @@ let
# Note: -e removed intentionally - grep returns 1 when no matches # Note: -e removed intentionally - grep returns 1 when no matches
bashOptions = [ "nounset" "pipefail" ]; bashOptions = [ "nounset" "pipefail" ];
runtimeInputs = with pkgs; [ systemd gnugrep coreutils util-linux killswitch gawk ]; runtimeInputs = with pkgs; [ systemd gnugrep coreutils util-linux killswitch gawk ];
text = builtins.replaceStrings text = builtins.readFile ./scripts/egress-watchdog;
[ "/usr/local/bin/killswitch" ]
[ "killswitch" ]
(builtins.readFile ./scripts/egress-watchdog);
}; };
# ========================================================================== # ==========================================================================

2
scripts/cpu-watchdog
View file

@ -33,7 +33,7 @@ for homedir in /home/*; do
logger -t cpu-watchdog "User $user at ${pct}% CPU (strike $count/$MAX_STRIKES)" logger -t cpu-watchdog "User $user at ${pct}% CPU (strike $count/$MAX_STRIKES)"
if [ "$count" -ge "$MAX_STRIKES" ]; then if [ "$count" -ge "$MAX_STRIKES" ]; then
/usr/local/bin/killswitch "$user" "sustained CPU abuse (${pct}%)" killswitch "$user" "sustained CPU abuse (${pct}%)"
rm -f "$COUNTDIR/$user" rm -f "$COUNTDIR/$user"
fi fi
else else

2
scripts/egress-watchdog
View file

@ -41,7 +41,7 @@ while read -r count uid; do
logger -t egress-watchdog "User $user hit egress limit $count times (strike $strikes/$MAX_STRIKES)" logger -t egress-watchdog "User $user hit egress limit $count times (strike $strikes/$MAX_STRIKES)"
if [ "$strikes" -ge "$MAX_STRIKES" ]; then if [ "$strikes" -ge "$MAX_STRIKES" ]; then
/usr/local/bin/killswitch "$user" "egress abuse ($count blocked connections)" killswitch "$user" "egress abuse ($count blocked connections)"
rm -f "$COUNTDIR/$user" rm -f "$COUNTDIR/$user"
fi fi
else else