# generated instead of dynamic for the benefit of shellcheck
#for x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do echo source $x ; done
source /a/bin/distro-functions/src/identify-distros
-source /a/bin/distro-functions/src/package-manager-abstractions
source /a/bin/log-quiet/logq-function
# for x in /a/bin/bash_unpublished/source-!(.#*); do echo source $x; done
source /a/bin/bash_unpublished/source-semi-priv
# note, i had --delete-excluded, but that deletes all files in --exclude-from on
# the remote site, which doesn't make sense, so not sure why i had it.
local p a
- p=(/a/opt/{emacs-debian10{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+ p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
ret=0
for h in li je bk; do
m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/ || ret=$?
- # only li is debian10
+ # only li is debian11
p[0]=/a/opt/emacs-ubuntu20.04
p[1]=/a/opt/emacs-ubuntu20.04-nox
done
digdiff @ns{1,2}.iankelling.org "$@"
}
+tsr() { # ts run
+ "$@" |& ts || return $?
+}
dup() {
local ran_d
case $PS1 in
*[\ \]]D\ *)
pushd /
- /b/ds/distro-begin || return $?
- /b/ds/distro-end || return $?
+ /b/ds/distro-begin |& ts || return $?
+ /b/ds/distro-end |& ts || return $?
popd
ran_d=true
;;&
*[\ \]]DB\ *)
pushd /
- /b/ds/distro-begin || return $?
+ /b/ds/distro-begin |& ts || return $?
popd
ran_d=true
;;
*[\ \]]DE\ *)
pushd /
- /b/ds/distro-end || return $?
+ /b/ds/distro-end |& ts || return $?
popd
ran_d=true
;;&
local host ipsuf umask_orig
host=$1
ipsuf=$2
- mkdir -p /p/c/machine_specific/$host/filesystem/etc/{wireguard,network/interfaces.d}
+ mkdir -p /p/c/machine_specific/$host/filesystem/etc/wireguard
cd /p/c/machine_specific/$host/filesystem/etc/wireguard
umask_orig=$(umask)
umask 0077
- wg genkey | tee $host-priv.key | wg pubkey > $host-pub.key
+ wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key
cat >wghole.conf <<EOF
[Interface]
# contents hole-priv.key
sudo chown $USER:$USER /mnt/$base
else
base=$1
- sudo umount /mnt/$base
+ if mountpoint /mnt/$base &>/dev/null; then
+ sudo umount /mnt/$base
+ fi
l=$(sudo cryptsetup status /dev/mapper/$base|sed -rn 's/^\s*device:\s*(.*)/\1/p')
sudo cryptsetup luksClose /dev/mapper/$base || return 1
sudo losetup -d $l
# other tiling window managers in giving up on setting it at all
#
xprop -root -remove _NET_WORKAREA
- command pumpa &r
+ command pumpa & r
}
# reviewboard, used at my old job
(sleep $(calc "$* * 60") && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
}
-trg() { transmission-remote-gtk&r; }
+trg() { transmission-remote-gtk & r; }
trc() {
# example, set global upload limit to 100 kilobytes:
# trc -u 100
TR_AUTH=":$(jq -r .profiles[0].password ~/.config/transmission-remote-gtk/config.json)" transmission-remote transmission.lan -ne "$@"
}
+trysleep() {
+ retries="$1"
+ sleepsecs="$2"
+ shift 2
+ for (( i=0; i < retries - 1; i++ )); do
+ if "$@"; then
+ return 0
+ fi
+ sleep $sleepsecs
+ done
+ "$@"
+}
+
tu() {
local s
mailnnbash() {
m sudo nsenter -t $(systemctl status mailnn| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
}
+
mailvpnbash() {
m sudo nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*mail.conf") -n -m sudo -u $USER -i bash
}
spamdpid=$(systemctl status spamassassin| sed -n '/^ *Main PID:/s/[^0-9]//gp')
m sudo nsenter -t $spamdpid -n -m sudo -u Debian-exim spamassassin "$@"
}
+unboundbash() {
+ m sudo nsenter -t $(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
+}
mailnncheck() {
local pid ns mailnn
m sudo -E env "PATH=$PATH" nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n -m "$@"
}
vpnf() {
- vpncmd sudo -E -u iank env "PATH=$PATH" abrowser -no-remote -P vpn &r
+ vpncmd sudo -E -u iank env "PATH=$PATH" abrowser -no-remote -P vpn & r
}
vpn2f() {
- vpncmd sudo -u iank env "PATH=$PATH" abrowser -no-remote -P vpn2 &r
+ vpncmd sudo -u iank env "PATH=$PATH" abrowser -no-remote -P vpn2 & r
}
vpni() {
sudo systemd-tty-ask-password-agent
}
+# systemctl is-enabled / status / cat says nothing, instead theres
+# some obscure symlink. paths copied from man systemd.unit.
+# possibly also usefull, but incomplete, doesnt show units not loaded in memory:
+# seru list-dependencies --reverse --all UNIT
+sysd-deps() {
+ local f
+ local -a dirs search
+ ngset
+
+ case $1 in
+ u)
+ search=(
+ ~/.config/systemd/user.control/*
+ $XDG_RUNTIME_DIR/systemd/user.control/*
+ $XDG_RUNTIME_DIR/systemd/transient/*
+ $XDG_RUNTIME_DIR/systemd/generator.early/*
+ ~/.config/systemd/user/*
+ /etc/systemd/user/*
+ $XDG_RUNTIME_DIR/systemd/user/*
+ /run/systemd/user/*
+ $XDG_RUNTIME_DIR/systemd/generator/*
+ ~/.local/share/systemd/user/*
+ /usr/lib/systemd/user/*
+ $XDG_RUNTIME_DIR/systemd/generator.late/*
+ )
+ ;;
+ *)
+ search=(
+ /etc/systemd/system.control/*
+ /run/systemd/system.control/*
+ /run/systemd/transient/*
+ /run/systemd/generator.early/*
+ /etc/systemd/system/*
+ /etc/systemd/systemd.attached/*
+ /run/systemd/system/*
+ /run/systemd/systemd.attached/*
+ /run/systemd/generator/*
+ /lib/systemd/system/*
+ /run/systemd/generator.late/*
+ )
+ ;;
+ esac
+ for f in "${search[@]}"; do
+ [[ -d $f ]] || continue
+ case $f in
+ *.requires|*.wants)
+ dirs+=("$f")
+ ;;
+ esac
+ done
+ # dirs is just so we write out the directory names, ls does it when there is 2 or more dirs.
+ case ${#dirs[@]} in
+ 1)
+ echo "${dirs[0]}:"
+ ll "${dirs[@]}"
+ ;;
+ 0) : ;;
+ *)
+ ll "${dirs[@]}"
+ ;;
+ esac
+ ngreset
+}
+
+fixvpndns() {
+ local link istls
+ read _ link _ istls < <(resolvectl dnsovertls tunfsf)
+ case $istls in
+ yes|no) : ;;
+ *) echo fixvpndns error: unexpected istls value: $istls >&2; return 1 ;;
+ esac
+ s busctl call org.freedesktop.resolve1 /org/freedesktop/resolve1 org.freedesktop.resolve1.Manager SetLinkDNSOverTLS is $link no
+}
+
vpnoff() {
[[ $1 ]] || { echo need arg; return 1; }
if [[ -e /lib/systemd/system/openvpn-client@.service ]]; then
sudo systemctl stop $vpn_service@$1
}
vpnoffc() { # vpn off client
- ser stop openvpn-nn@client
+ ser stop openvpn-client-tr@client
}
vpnc() {
- ser start openvpn-nn@client
+ ser start openvpn-client-tr@client
}