standardize naming

diff --git a/filesystem/etc/cron.d/ian b/filesystem/etc/cron.d/ian
index 6c83f86ce294d603fd406708d1402a38e9751bb7..3684db2cdcd834833c00bf627d6659e5c2828239 100644 (file)
--- 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 18712fcdee73fef491061c331568db1ab689a35c..31b11542be3c1def32ff7ccd00976d809d2c9e72 100644 (file)
--- 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 4454391499b607f64c0546938549899ec4cd223d..499d8d14507758f112b20641930b6b751faf8b09 100644 (file)
--- 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 234a62464c3be4e86ac0a6f6bc58f760e520e163..fbd29d19ff3aa8e689b2f1b564021783f0b4fed3 100644 (file)
--- 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