From 1bd2551b854c641337c13b3258aa6bc1eb7a14af Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 1 Oct 2025 07:25:04 +0200 Subject: [PATCH] Fixes. --- trixie/copy/ircplom/etc/systemd/system/ircplom.service | 4 +++- .../ircplom/home/plom/.local/bin/encrypt_ircplom_logs | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/trixie/copy/ircplom/etc/systemd/system/ircplom.service b/trixie/copy/ircplom/etc/systemd/system/ircplom.service index 9c6105a..a2beacb 100644 --- a/trixie/copy/ircplom/etc/systemd/system/ircplom.service +++ b/trixie/copy/ircplom/etc/systemd/system/ircplom.service @@ -6,10 +6,12 @@ After=network.target Type=simple User=plom WorkingDirectory=/home/plom +# once per second check if dtach file still exists, only declare run over (and thereby re-start possible) once it doesn't ExecStart=/bin/sh -lc "dtach -n /tmp/dtach_ircplom && while true; do sleep 1; test ! -e /tmp/dtach_ircplom && break; done" -ExecStop=/bin/sh -lc "rm /tmp/dtach_ircplom" +ExecStop=/bin/sh -lc "rm -f /tmp/dtach_ircplom" Environment=TERM=linux Restart=on-success +# leave enough time for manual intervention if need be RestartSec=10 [Install] diff --git a/trixie/copy/ircplom/home/plom/.local/bin/encrypt_ircplom_logs b/trixie/copy/ircplom/home/plom/.local/bin/encrypt_ircplom_logs index 18ef129..b4f58c2 100755 --- a/trixie/copy/ircplom/home/plom/.local/bin/encrypt_ircplom_logs +++ b/trixie/copy/ircplom/home/plom/.local/bin/encrypt_ircplom_logs @@ -1,7 +1,8 @@ -#!/bin/sh +#!/usr/bin/env dash set -e -cd $(dirname "$0") -. lib/expect_n_args +ROOT=$(dirname "$0") +cd "${ROOT}" +. lib/expect_n_args.sh expect_n_args 0 0 '' @@ -11,7 +12,7 @@ PATH_ENCRYPTION_KEY="${HOME}/.plomlib/encrypt_with.pub" TODAY="$(date +'%Y-%m-%d')" set +e -PATHS_LOGFILES="$(ls ${PATH_LOGS}/*/*/*.log 2> /dev/null)" +PATHS_LOGFILES=$(ls "${PATH_LOGS}"/*/*/*.log 2> /dev/null) set -e if [ -z "${PATHS_LOGFILES}" ]; then echo "No log files present, so nothing to do." -- 2.30.2