export NOT_MAIL_HOST_P=t
fi
-
-source /a/bin/log-quiet/logq-function
-
-# not used
-# if [[ -s /a/opt/alacritty/extra/completions/alacritty.bash ]]; then
-# source /a/opt/alacritty/extra/completions/alacritty.bash
-# fi
-
-
source /a/bin/ds/beet-data
# todo: enter should also unpause
beetag() {
local last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random path
- local do_rare_genres read_wait help line lsout tmp ls_line skip_lookback
+ local do_rare_genres read_wait line lsout tmp ls_line skip_lookback
local escape_char escaped_input expected_input skip_input_regex right_pad erasable_line seek_sec
local pl_state_path pl_state_dir pl_state_file tmpstr
local new_random pl_seed_path seed_num seed_file fmt first_play repeat1
# test whether missing files were renamed, generally for use with fsdiff
# $1 = fsdiff output file, $2 = directory to compare to. pwd = fsdiff dir
# echos non-renamed files
- local x y found
- unset sums
+ local x line found renamed
+ local -a sums
for x in "$2"/*; do
{ sums+=( "$(md5sum < "$x")" ) ; } 2>/dev/null
done
dejagnu() { /a/opt/dejagnu/dejagnu "$@"; }
+# do git status on published repos.
hstatus() {
- # do git status on published repos.
c /a/bin/githtml
for x in *; do
cd "$(readlink -f $x)"/..
done
}
+hsk() {
+ local x
+ c /a/bin/githtml
+ for x in *; do
+ cd "$(readlink -f $x)"/..
+ skgit
+ cd /a/bin/githtml
+ done
+}
+
## work log
#
# note: database location is specified in ~/.timetrap.yml, currently /p/.timetrap.db
done
}
ilog() {
- local chan
+ local chan tmpf
+ tmpf=$(mktemp)
chan="${1:-#fsfsys}"
# use * instead of -r since that does sorted order
- sl root@iankelling.org ilog-local "$chan" | less +G
+ sl root@li.b8.nz ilog-local "$chan" > $tmpf
+ less +G $tmpf
+ rm -f $tmpf
}
o() {
# wrt-setup
host-info-update() {
- local -A vpn_ips host_ips host_macs nonvpn_ips
+ local -A vpn_ips host_ips host_macs nonvpn_ips all_ips
local -a root_hosts nonroot_hosts
# the hosts with no mac
while read -r ip host mac opts; do
if [[ $ip == *#* || ! $host ]]; then continue; fi
- if [[ $opts == vpn ]]; then
+
+ # opt parsing
+ vpn=false
+ root=false
+ for opt in $opts; do
+ case $opt in
+ user=root)
+ root=true
+ ;;
+ vpn)
+ vpn=true
+ ;;
+ esac
+ done
+
+ all_ips[$host]=$ip
+ if $vpn; then
vpn_ips[$host]=$ip
else
nonvpn_ips[$host]=$ip
fi
-
-
- if [[ $opts == user=root ]]; then
- # note: the b8.nz suffix is for the User part, the IdentityFile
- # part is redundant to *.b8.nz.
- root_hosts+=($host i$host $host.b8.nz i$host.b8.nz)
+ if $root; then
+ # note: the reason we have b8.nz suffix here but not for non_root
+ # hosts is that it is for the User part, the IdentityFile part is
+ # redundant to *.b8.nz. Also note ${host}i, we only setup those for vpn hosts, but there is no harm in overspecifying here.
+ root_hosts+=($host ${host}i $host.b8.nz ${host}i.b8.nz)
else
- nonroot_hosts+=($host i$host)
+ nonroot_hosts+=($host ${host}i)
fi
host_ips[$host]=$ip
host_macs[$host]=$mac
done </p/c/host-info
- cedit /p/c/subdir_files/.ssh/config <<EOF || [[ $? == 1 ]]
+ {
+ cat <<EOF
Host ${nonroot_hosts[@]}
User iank
IdentityFile ~/.ssh/home
Host ${root_hosts[@]}
IdentityFile ~/.ssh/home
+
EOF
+ for host in ${!vpn_ips[@]}; do
+ ipsuf=${vpn_ips[$host]}
+ cat <<EOF
+Host ${host}i
+Hostname b8.nz
+Port $((2200 + ipsuf))
+
+EOF
+ done
+
+ # convenience of one auth key entry
+ for host in ${!all_ips[@]}; do
+ cat <<EOF
+Host $host ${host}i $host.b8.nz ${host}i.b8.nz
+HostKeyAlias $host.b8.nz
+EOF
+ done
+ } | cedit /p/c/subdir_files/.ssh/config || [[ $? == 1 ]]
+
+ {
+ echo "cat <<EOF"
+ for host in ${!vpn_ips[@]}; do
+ ipsuf=${vpn_ips[$host]}
+ i_port=$(( 2200 + ipsuf ))
+ cat <<EOF
+config redirect
+ option name ssh$host
+ option src wan
+ option src_dport $i_port
+ option dest_port 22
+ option dest_ip \$l.$ipsuf
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port $i_port
+EOF
+ done
+ echo "EOF"
+ } >/p/c/cmc-firewall-data
local host ipsuf f files
+ # shellcheck disable=SC2016 # shellcheck doesnt know this is sed
sedi '/edits below here are made automatically/,$d' /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf
for host in ${!vpn_ips[@]}; do
+ if [[ ${root_ips[$host]} ]]; then
+ # root machines dont run transmission
+ continue
+ fi
ipsuf=${vpn_ips[$host]}
wghole $host $ipsuf
u /a/bin/ds/machine_specific/$host/filesystem/etc/systemd/system/openvpn-client-tr@.service <<EOF
echo "cat <<EOF"
for host in ${!host_ips[@]}; do
ipsuf=${host_ips[$host]}
+ # shellcheck disable=SC2016 # intentional
echo 'local-data-ptr: "$l.'$ipsuf $host.b8.nz'"'
done
echo "EOF"
echo "EOF"
} | u /p/c/dnsmasq-data
+ b8_ip=$(dig +short b8.nz @iankelling.org | tail -1)
+ if [[ ! $b8_ip ]]; then
+ echo "$0: error: got empty b8.nz ip. returning 1"
+ return 1
+ fi
{
+ echo "@ A $b8_ip"
for host in ${!nonvpn_ips[@]}; do
ipsuf=${nonvpn_ips[$host]}
echo "$host A 10.2.0.$ipsuf"
echo checking for stray files:
- initial_dir=$PWD
+ initial_dir="$PWD"
cd /a/bin/ds/machine_specific
ngset
files=( */filesystem/etc/systemd/system/openvpn-client-tr@.service )
ngreset
- cd $initial_dir
+ cd "$initial_dir"
for f in "${files[@]}"; do
host=${f%%/*}
if [[ ! ${vpn_ips[$host]} ]]; then
iankelling.org / git / distro-setup / blobdiff