From 1a2d91b0d76646add72702bb29d7c71fc398acdc Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Sat, 19 Jul 2025 07:40:13 +0200 Subject: [PATCH] Update 2025-07-19 07:40 OpenBSD/amd64-t14 --- .bin/OLD/edit-dns | 14 -------------- .bin/tarsnap-restore | 24 +++++++++++++++++++++--- .bin/update-adlist | 2 +- .bin/ytdl | 3 ++- .kshrc | 4 ++-- .ssh/config | 4 ++++ 6 files changed, 30 insertions(+), 21 deletions(-) delete mode 100755 .bin/OLD/edit-dns diff --git a/.bin/OLD/edit-dns b/.bin/OLD/edit-dns deleted file mode 100755 index 349166b..0000000 --- a/.bin/OLD/edit-dns +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -ZONE=codevoid.de - -if [ ! -z $1 ] -then - ZONE=$1 -fi - -ssh -t dns.codevoid.de \ - "doas vim /var/nsd/zones/master/$ZONE \ - && doas nsd-control reload" - -sleep 2 diff --git a/.bin/tarsnap-restore b/.bin/tarsnap-restore index acbe3f3..4bab969 100755 --- a/.bin/tarsnap-restore +++ b/.bin/tarsnap-restore @@ -15,6 +15,24 @@ if [ -z "$_backup" ]; then exit 1 fi -mkdir "restore_$1" -doas tarsnap --humanize-numbers -xvf "$_backup" -C "restore_$1" -print "Data restored in $(readlink -f "restore_$1")" +print "Found Backup: $_backup" +mkdir -p "restore_$1" +print "Extracting to: $(readlink -f $PWD/restore_$1)" + +if [ -f "restore_$1/.done" ] +then + print "Skipping, because restore_$1/.done file exists." +else + doas tarsnap -tf "$_backup" \ + | xargs -P 20 -n 20 -t \ + doas tarsnap --humanize-numbers --resume-extract --chroot -xf "$_backup" -C "restore_$1" -- + + if [ $? -eq 0 ] + then + print "Data restored in $(readlink -f "restore_$1")" + touch "restore_$1/.done" + else + print "Restore aborted..." + fi +fi +print "" diff --git a/.bin/update-adlist b/.bin/update-adlist index a0ba0aa..5556b59 100755 --- a/.bin/update-adlist +++ b/.bin/update-adlist @@ -99,7 +99,7 @@ _disabled() { _domainfilter() { # chain grep commands used in assemble pipe - grep -Ev "torrent|tattoo|xhamster|xvideos|porn" \ + grep -Ev "torrent|tattoo|xhamster|xvideos|porn|motherless|redgifs" \ | grep -Ev "whatsapp\.net|whatsapp\.com|instagram\.com" \ | grep -Ev "adobe\.com|adobelogin\.com" \ | grep -Ev "microsoft\.com" diff --git a/.bin/ytdl b/.bin/ytdl index 209d0f8..8badeb4 100755 --- a/.bin/ytdl +++ b/.bin/ytdl @@ -8,5 +8,6 @@ fi mkdir -p "$HOME/ytdl/$1/" update-ksh-completions & cd "$HOME/ytdl/$1/" -yt-dlp --cookies-from-browser chromium "$2" +shift +yt-dlp --cookies-from-browser chromium "$@" diff --git a/.kshrc b/.kshrc index 887e7b2..2a13243 100644 --- a/.kshrc +++ b/.kshrc @@ -86,8 +86,8 @@ TOG_COLORS=1 export GOT_AUTHOR TOG_COLORS # BUPSTASH -BUPSTASH_REPOSITORY=ssh://sdk@storage.bupstash.io -BUPSTASH_KEY_COMMAND="pass Internet/bupstash-key" +BUPSTASH_REPOSITORY=ssh://backup-fsn.codevoid.de/home/bupstash +BUPSTASH_KEY_COMMAND="pass Internet/backup-fsn.codevoid.de-key" export BUPSTASH_REPOSITORY BUPSTASH_KEY_COMMAND # PASSWORD-STORE diff --git a/.ssh/config b/.ssh/config index 3f54651..e440056 100644 --- a/.ssh/config +++ b/.ssh/config @@ -53,6 +53,10 @@ Host home.codevoid.de Hostname home.codevoid.de User sdk +Host backup-fsn.codevoid.de + User u475462-sub1 + Port 23 + Host dalek Hostname dalek.home.codevoid.de User sdk