From f9bd673fb990c76b8b1101956c110bce11e012c1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 23 Feb 2026 21:14:29 -0500 Subject: [PATCH] standardize naming --- filesystem/etc/cron.d/ian | 1 + .../frodo/filesystem/etc/btrbk/{rbackup.conf => r5.conf} | 4 ++-- .../frodo/filesystem/etc/btrbk/{r.conf => root-r.conf} | 4 ++-- .../systemd/system/{btrbkr.service => btrbk-root-r.service} | 2 +- .../etc/systemd/system/{btrbkr.timer => btrbk-root-r.timer} | 0 .../systemd/system/{btrbkrbackup.service => btrbkr5.service} | 0 .../etc/systemd/system/{btrbkrbackup.timer => btrbkr5.timer} | 0 7 files changed, 6 insertions(+), 5 deletions(-) rename machine_specific/frodo/filesystem/etc/btrbk/{rbackup.conf => r5.conf} (78%) rename machine_specific/frodo/filesystem/etc/btrbk/{r.conf => root-r.conf} (73%) rename machine_specific/frodo/filesystem/etc/systemd/system/{btrbkr.service => btrbk-root-r.service} (88%) rename machine_specific/frodo/filesystem/etc/systemd/system/{btrbkr.timer => btrbk-root-r.timer} (100%) rename machine_specific/frodo/filesystem/etc/systemd/system/{btrbkrbackup.service => btrbkr5.service} (100%) rename machine_specific/frodo/filesystem/etc/systemd/system/{btrbkrbackup.timer => btrbkr5.timer} (100%) diff --git a/filesystem/etc/cron.d/ian b/filesystem/etc/cron.d/ian index 6c83f86..3684db2 100644 --- a/filesystem/etc/cron.d/ian +++ b/filesystem/etc/cron.d/ian @@ -34,6 +34,7 @@ MAILTO=root 4 20 * * 5 iank check-lets-encrypt-ssl-settings 4 21 * * 5 iank auto-commit-changes /a /p 4 23 * * 5 iank failmail eggdrop-upgrade +12 22 * * 5 iank failmail /b/bash_unpublished/cron-misc # avoid dnssec expirations. This is a hack, what we should diff --git a/machine_specific/frodo/filesystem/etc/btrbk/rbackup.conf b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf similarity index 78% rename from machine_specific/frodo/filesystem/etc/btrbk/rbackup.conf rename to machine_specific/frodo/filesystem/etc/btrbk/r5.conf index 18712fc..31b1154 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/rbackup.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf @@ -1,6 +1,6 @@ transaction_syslog local7 -lockfile /var/lock/btrbk-rbackup.lock +lockfile /var/lock/btrbk-r5.lock timestamp_format long-iso @@ -14,7 +14,7 @@ target_preserve 18h 14d 8w 12m target_preserve_min 2d rate_limit no -volume /mnt/rbackup +volume /mnt/r5 subvolume d # moved #subvolume ar diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r.conf b/machine_specific/frodo/filesystem/etc/btrbk/root-r.conf similarity index 73% rename from machine_specific/frodo/filesystem/etc/btrbk/r.conf rename to machine_specific/frodo/filesystem/etc/btrbk/root-r.conf index 4454391..499d8d1 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/r.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/root-r.conf @@ -1,6 +1,6 @@ transaction_syslog local7 -lockfile /var/lock/btrbk-rbackup.lock +lockfile /var/lock/btrbk-root-r.lock timestamp_format long-iso @@ -16,4 +16,4 @@ target_preserve_min 2h rate_limit no volume /mnt/root subvolume r -target send-receive /mnt/rbackup/btrbk +target send-receive /mnt/r5/btrbk diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.service b/machine_specific/frodo/filesystem/etc/systemd/system/btrbk-root-r.service similarity index 88% rename from machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.service rename to machine_specific/frodo/filesystem/etc/systemd/system/btrbk-root-r.service index 234a624..fbd29d1 100644 --- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.service +++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbk-root-r.service @@ -4,4 +4,4 @@ After=multi-user.target [Service] Type=oneshot -ExecStart=/usr/local/bin/sysd-mail-once btrbkr btrbk -c /etc/btrbk/r.conf run +ExecStart=/usr/local/bin/sysd-mail-once btrbkr btrbk -c /etc/btrbk/root-r.conf run diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbk-root-r.timer similarity index 100% rename from machine_specific/frodo/filesystem/etc/systemd/system/btrbkr.timer rename to machine_specific/frodo/filesystem/etc/systemd/system/btrbk-root-r.timer diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service similarity index 100% rename from machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.service rename to machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.timer similarity index 100% rename from machine_specific/frodo/filesystem/etc/systemd/system/btrbkrbackup.timer rename to machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.timer -- 2.30.2