mostly fix backups. untested

diff --git a/brc b/brc
index 557fe507a5c38cab9c2d8e8606c89ac04dc98788..22bb48791a0aaec6cfd63396d9226dda9075369b 100644 (file)
--- a/brc
+++ b/brc
@@ -4924,6 +4924,9 @@ pidw() {
 local x=$(mktemp); e $pid >$x; pidwait -e -F $x; rm $x
 }
 
+# printf string + newline
+pn() { printf '%s\n' "$@"; }
+
 # * stuff that makes sense to be at the end
 
 # note, if we unset IFS, that will mess up completion scripts which

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/n123.conf b/machine_specific/frodo/filesystem/etc/btrbk/n123.conf
deleted file mode 100644 (file)
index b54f8ee..0000000
--- a/machine_specific/frodo/filesystem/etc/btrbk/n123.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-n3.lock
-
-timestamp_format long-iso
-
-snapshot_create onchange
-
-snapshot_preserve 18h 14d 8w 12m
-snapshot_preserve_min 2d
-snapshot_dir btrbk
-
-target_preserve 18h 14d 8w 12m
-target_preserve_min 2d
-
-rate_limit no
-
-volume /mnt/n3
-subvolume dia
-subvolume dib
-subvolume dic
-subvolume did
-subvolume die
-subvolume dif
-subvolume dig
-subvolume dih
-subvolume dii
-subvolume dij
-subvolume dik
-subvolume dil
-subvolume dim
-subvolume din
-subvolume dio
-subvolume dip
-subvolume diq
-subvolume dir
-subvolume dis
-subvolume dit
-subvolume dlapi

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf b/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf
new file mode 100644 (file)
index 0000000..09a0049
--- /dev/null
+++ b/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf
@@ -0,0 +1,17 @@
+lockfile /var/lock/btrbk-nbase.lock
+transaction_syslog local7
+timestamp_format long-iso
+send_compressed_data yes
+snapshot_preserve 18h 14d 8w 12m
+snapshot_preserve_min 2d
+snapshot_dir btrbk
+target_preserve 18h 14d 8w 12m
+target_preserve_min 2d
+snapshot_create onchange
+
+volume /mnt/nbase
+subvolume rbase
+target send-receive /mnt/root/btrbk
+target send-receive ssh://kd.b8.nz/mnt/r6/btrbk
+subvolume rjson
+target send-receive ssh://kd.b8.nz/mnt/r6/btrbk

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r2.conf b/machine_specific/frodo/filesystem/etc/btrbk/r2.conf
index 2dd61a58ddbaa618611d52032382bc43bf305301..83b5c20189385e5a651f8e8012fcf5d3cb1f6ff6 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r2.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r2.conf
@@ -1,19 +1,22 @@
+lockfile /var/lock/btrbk-r2.lock
 transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-r2.lock
-
 timestamp_format long-iso
-
-snapshot_create onchange
-
+send_compressed_data yes
 snapshot_preserve 18h 14d 8w 12m
 snapshot_preserve_min 2d
 snapshot_dir btrbk
-
 target_preserve 18h 14d 8w 12m
 target_preserve_min 2d
+snapshot_create onchange
 
-rate_limit no
 volume /mnt/r2
 subvolume srip1
 subvolume fsf-mailrec
+subvolume m8
+subvolume m9
+subvolume ma
+subvolume mb
+subvolume diq
+subvolume dir
+subvolume dis
+subvolume dit

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
index 0fc7d4a0a11a4f78a2b347b6aeb4c655e3e809b5..1312e9585b0756df3a3f9554b6c2425e81bb50d2 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf
@@ -1,26 +1,22 @@
+lockfile /var/lock/btrbk-r3.lock
 transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-r3.lock
-
 timestamp_format long-iso
-
-snapshot_create onchange
-
+send_compressed_data yes
 snapshot_preserve 18h 14d 8w 12m
 snapshot_preserve_min 2d
 snapshot_dir btrbk
-
 target_preserve 18h 14d 8w 12m
 target_preserve_min 2d
+snapshot_create onchange
 
-rate_limit no
 volume /mnt/r3
 
 subvolume ar
 subvolume d-r3
 
-subvolume m8
-subvolume m9
-
 subvolume qr
 subvolume srip2
+subvolume dia
+subvolume dib
+subvolume dic
+subvolume did

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r4.conf b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf
index 9cbe7b8b19af9658ccc144b6b2c5897726025e80..f50832a84c3a832df645eacfc64824d1cc64b008 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r4.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf
@@ -1,30 +1,21 @@
+lockfile /var/lock/btrbk-r4.lock
 transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-r4.lock
-
 timestamp_format long-iso
-
-snapshot_create onchange
-
+send_compressed_data yes
 snapshot_preserve 18h 14d 8w 12m
 snapshot_preserve_min 2d
 snapshot_dir btrbk
-
 target_preserve 18h 14d 8w 12m
 target_preserve_min 2d
+snapshot_create onchange
 
-rate_limit no
 volume /mnt/r4
-subvolume m3
 subvolume m4
 subvolume m5
 subvolume m6
 subvolume m7
-subvolume ma
-subvolume mb
-subvolume mc
-subvolume md
-subvolume me
-subvolume mf
-
 subvolume roverflow
+subvolume die
+subvolume dif
+subvolume dig
+subvolume dih

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
index 3798a873cb0a64503bbdeb9709cb7d9be47bc8a8..d8324cbb07fec1f86107c0e4e62d764589b47598 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
@@ -1,19 +1,21 @@
+lockfile /var/lock/btrbk-r5.lock
 transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-r5.lock
-
 timestamp_format long-iso
-
-snapshot_create onchange
-
+send_compressed_data yes
 snapshot_preserve 18h 14d 8w 12m
 snapshot_preserve_min 2d
 snapshot_dir btrbk
-
 target_preserve 18h 14d 8w 12m
 target_preserve_min 2d
-
-rate_limit no
+snapshot_create onchange
 
 volume /mnt/r5
 subvolume d
+subvolume mc
+subvolume md
+subvolume me
+subvolume mf
+subvolume dii
+subvolume dij
+subvolume dik
+subvolume dil

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/root.conf b/machine_specific/frodo/filesystem/etc/btrbk/root.conf
index b48b877cbcb95a607f1df0e212341c557782466c..038ca9a54810e678942e46b67d6cc42e1ae34aa9 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/root.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/root.conf
@@ -1,24 +1,25 @@
+lockfile /var/lock/btrbk-root.lock
 transaction_syslog local7
-
-lockfile                   /var/lock/btrbk-root.lock
-
 timestamp_format long-iso
-
-snapshot_create onchange
-
+send_compressed_data yes
 snapshot_preserve 18h 14d 8w 12m
 snapshot_preserve_min 2d
 snapshot_dir btrbk
-
 target_preserve 18h 14d 8w 12m
 target_preserve_min 2d
+snapshot_create onchange
 
-rate_limit no
 volume /mnt/root
-
-# a & q are handled separately by btrbk-run & btrbk.timer
-
 subvolume m0
+target send-receive /mnt/r3/btrbk
 subvolume m1
+target send-receive /mnt/r3/btrbk
 subvolume m2
+target send-receive /mnt/r3/btrbk
+subvolume m3
+target send-receive /mnt/r3/btrbk
 subvolume ro2
+target send-receive ssh://kd.b8.nz/mnt/r6/btrbk
+
+
+# side note: a & q are handled separately by btrbk-run & btrbk.timer

diff --git a/machine_specific/frodo/filesystem/etc/integritytab b/machine_specific/frodo/filesystem/etc/integritytab
new file mode 100644 (file)
index 0000000..2730192
--- /dev/null
+++ b/machine_specific/frodo/filesystem/etc/integritytab
@@ -0,0 +1,4 @@
+int-vgnvme-WD_BLACK_SN850P_for_PS5_8000GB_24517P800200-ndi /dev/vgnvme-WD_BLACK_SN850P_for_PS5_8000GB_24517P800200/ndi - allow-discards,mode=direct
+int-vgnvme-WD_BLACK_SN850X_8000GB_245244802091-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_245244802091/ndi - allow-discards,mode=direct
+int-vgnvme-WD_BLACK_SN850X_8000GB_245244802317-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_245244802317/ndi - allow-discards,mode=direct
+int-vgnvme-WD_BLACK_SN850X_8000GB_25026Y802189-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_25026Y802189/ndi - allow-discards,mode=direct

diff --git a/machine_specific/kd/filesystem/etc/btrbk/r6.conf b/machine_specific/kd/filesystem/etc/btrbk/r6.conf
new file mode 100644 (file)
index 0000000..4a63ef2
--- /dev/null
+++ b/machine_specific/kd/filesystem/etc/btrbk/r6.conf
@@ -0,0 +1,17 @@
+lockfile /var/lock/btrbk-r6.lock
+transaction_syslog local7
+timestamp_format long-iso
+send_compressed_data yes
+snapshot_preserve 18h 14d 8w 12m
+snapshot_preserve_min 2d
+snapshot_dir btrbk
+target_preserve 18h 14d 8w 12m
+target_preserve_min 2d
+snapshot_create onchange
+
+volume /mnt/r6
+subvolume dim
+subvolume din
+subvolume dio
+subvolume dip
+subvolume fsf-kaya

diff --git a/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service
new file mode 100644 (file)
index 0000000..0378e40
--- /dev/null
+++ b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Snapshot subvolumes that have a primary location in /mnt/r6
+After=multi-user.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/sysd-mail-once btrbkr6 btrbk -c /etc/btrbk/r6.conf run

diff --git a/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer
new file mode 100644 (file)
index 0000000..6239024
--- /dev/null
+++ b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Btrbk rbackup timer
+
+[Timer]
+OnCalendar=*-*-* 23:30:00 America/New_York
+
+[Install]
+WantedBy=timers.target

diff --git a/subdir_files/.config/konsolerc b/subdir_files/.config/konsolerc
index 310d7bf3f17eaaa5b3dd121c8bca7217adb1b70f..32bf4aa2b760438d4fec6231ff323de47b3a529f 100644 (file)
--- a/subdir_files/.config/konsolerc
+++ b/subdir_files/.config/konsolerc
@@ -24,8 +24,8 @@ ShowMenuBarByDefault=false
 2 screens: XPosition=2
 2 screens: YPosition=2
 3840x2160 screen: Height=2156
-3840x2160 screen: Width=3836
-3840x2160 screen: XPosition=2
+3840x2160 screen: Width=956
+3840x2160 screen: XPosition=1922
 3840x2160 screen: YPosition=2
 DP-0=DP-0
 DP-1 eDP-1=DP-1

diff --git a/subdir_files/.config/systemd/user/profanity.service b/subdir_files/.config/systemd/user/profanity.service
index 65bd7857a28fb3154b276cb38035f48ded95ad5e..c90c02d5ea670a62ae619272524fed0f305d8631 100644 (file)
--- a/subdir_files/.config/systemd/user/profanity.service
+++ b/subdir_files/.config/systemd/user/profanity.service
@@ -10,9 +10,14 @@ Description=profanity
 # After=default.target. I figured this probably works and is simpler.
 After=gpg-agent.service
 After=local-fs.target
-# on desktop, we need /d to mount, and based on logs, this is the next target after it mounts:
+# on desktop, we need /d to mount, and based on logs, this is the next target after it mounts.
+# However, this does nothing since a user service is blind to system targets.
 After=multi-user.target
 
+Restart=always
+RestartSec=30
+TimeoutStartSec=300
+
 [Service]
 # tmux requirement
 Type=forking