X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=1be253a6151eab4f2b735a557c67d026c5fa5b73;hb=8d29de95be2b44cac6e2cc3d0643f542be05e4bd;hp=b6a4bd320e9b79b2be4c09dfb8e1877ae478070c;hpb=b757c84a4fc56f58b4985681b76df655d8db007a;p=distro-setup

diff --git a/brc2 b/brc2
index b6a4bd3..1be253a 100644
--- a/brc2
+++ b/brc2
@@ -401,8 +401,7 @@ glue() {
 
 # usage: $0 REPO_PATH [URL_OR_PATH]
 _iki-convert() {
-  local url path input err repo_dir domain filename dir path url_dir
-  local initial_oldpwd initial_pwd
+  local url domain path input err repo_dir dir url_dir url
   repo_dir="$1"
   domain="$2"
   shift 2
@@ -417,7 +416,7 @@ _iki-convert() {
   fi
   case $input in
     http*)
-      path="$repo_dir/${input##http*://$domain/wiki/}"
+      path="$repo_dir/${input##http*://"$domain"/wiki/}"
       if [[ $path == */ ]]; then
         path=${path%/}.mdwn
       fi
@@ -633,7 +632,7 @@ beetag-help() {
     cat <<'EOF'
 
 
-y other genres   z fg player      ' = toggle play  1-5 rate
+y other genres   z fg player      ' = toggle play  1-5 rate    ] repeat1
 ; previous       _ = delete       up/down skip     mpv vol,pause,seek
 EOF
     hr
@@ -697,12 +696,13 @@ mpvrpc-percent-pos() {
 # 1-5 rate
 # q quit
 # ret next
+#
 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 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
+  local new_random pl_seed_path seed_num seed_file fmt first_play repeat1
   local -a buttons button_map ids tags tmp_tags initial_ls ls_lines paths
   local -A button_i
   local -i i j volume scrolled id_count line_int skip_start pre_j_count head_count skip_lookback
@@ -714,6 +714,7 @@ beetag() {
   scrolled=999 # more than any $LINES
   ### begin arg processing ###
   random=false
+  repeat1=false
   new_random=false
   case $1 in
     -r)
@@ -778,6 +779,7 @@ beetag() {
   fi
 
   # PijokVipiotOzeph is just a random string for a delimiter
+  # shellcheck disable=SC2016 # false positive
   fmt='%ifdef{rating,$rating }'"$fstring"'$genre | $title - $artist - $album   $length  $id PijokVipiotOzeph $path'
   # shellcheck disable=SC2016 # obvious reason
   tmpstr=$(beet ls -f "$fmt" "$@" | { if $random; then sort -R --random-source=$pl_seed_path; else cat; fi; } )
@@ -940,6 +942,15 @@ beetag() {
           echo volume=$volume
           continue
           ;;
+        ']')
+          if $repeat1; then
+            repeat1=false
+          else
+            repeat1=true
+          fi
+          echo repeat1=$repeat1
+          continue
+          ;;
         q)
           kill-bg-quiet
           return
@@ -1106,10 +1117,12 @@ beetag() {
         fi
       fi
     done
-    if (( j < id_count - 1 )); then
-      j+=1
-    else
-      j=0
+    if ! $repeat1; then
+      if (( j < id_count - 1 )); then
+        j+=1
+      else
+        j=0
+      fi
     fi
     if [[ $playlist ]]; then
       echo $j >$pl_state_path
@@ -2317,9 +2330,119 @@ wgkey() {
   umask $umask_orig
 }
 
+declare -A vpn_ips
+vpn_ips[kd]=2
+# note: 1, 4, 5 are occupied by mail wireguard
+vpn_ips[x3]=8
+vpn_ips[sy]=12
+vpn_ips[x2]=13
+vpn_ips[kw]=27
+vpn_ips[bo]=28
+vpn_ips[frodo]=34
+
+vpn-ips-update() {
+  local host ipsuf f files
+  for host in ${!vpn_ips[@]}; do
+    ipsuf=${vpn_ips[$host]}
+    wghole $host $ipsuf
+    u /a/bin/ds/machine_specific/$host/filesystem/etc/systemd/system/openvpn-client-tr@.service <<EOF
+[Unit]
+Description=OpenVPN tunnel for %I
+After=syslog.target network-online.target
+Wants=network-online.target
+Documentation=man:openvpn(8)
+Documentation=https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage
+Documentation=https://community.openvpn.net/openvpn/wiki/HOWTO
+Requires=iptables.service
+
+[Service]
+Type=notify
+RuntimeDirectory=openvpn-client
+RuntimeDirectoryMode=0710
+WorkingDirectory=/etc/openvpn/client
+ExecStart=/usr/sbin/openvpn --suppress-timestamps --nobind --config /etc/openvpn/client/%i.conf
+# todo, try reenabling this from the default openvpn,
+# it was disabled so we could do bind mounts as a command,
+# but now systemd handles it
+#CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE
+LimitNPROC=10
+# DeviceAllow=/dev/null rw
+# DeviceAllow=/dev/net/tun rw
+
+# we use .1 to make this be on a different network than kd, so that we can
+# talk to transmission on kd from remote host, and still use this
+# vpn.
+ExecStartPre=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns -n 10.174.$ipsuf start %i
+ExecStartPre=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules
+# allow wireguard network to connect
+ExecStartPre=/usr/sbin/ip r add 10.8.0.0/24 via 10.174.$ipsuf.1 dev veth1-client
+ExecStopPost=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns stop %i
+PrivateNetwork=true
+BindReadOnlyPaths=/etc/tr-resolv:/run/systemd/resolve:norbind /etc/basic-nsswitch:/etc/resolved-nsswitch:norbind
+
+[Install]
+WantedBy=multi-user.target
+EOF
+  done
+
+  {
+    for host in ${!vpn_ips[@]}; do
+      ipsuf=${vpn_ips[$host]}
+      cat <<EOF
+local-data-ptr: "10.2.0.$ipsuf $host.b8.nz"
+EOF
+    done
+  } | u /b/ds/ptr-data
+
+  {
+    for host in ${!vpn_ips[@]}; do
+      ipsuf=${vpn_ips[$host]}
+      cat <<EOF
+$host	A	10.2.0.$ipsuf
+${host}wg	A	10.8.0.$ipsuf
+${host}vp	A	10.5.5.$ipsuf
+${host}tr	A	10.174.$ipsuf.2
+EOF
+    done
+  } | cedit vpn-ips-update /p/c/machine_specific/vps/bind-initial/db.b8.nz ||:
+
+
+  echo checking for stray files:
 
-# extrahost is a host/cidr that is allowed to go be routed through the vpn by this host.
+  initial_dir=$PWD
+  cd /a/bin/ds/machine_specific
+  ngset
+  files=( */filesystem/etc/systemd/system/openvpn-client-tr@.service )
+  ngreset
+  cd $initial_dir
+  for f in "${files[@]}"; do
+    host=${f%%/*}
+    if [[ ! ${vpn_ips[$host]} ]]; then
+      e /a/bin/ds/machine_specific/$host/filesystem/etc/systemd/system/openvpn-client-tr@.service
+    fi
+  done
+
+  cd /p/c/machine_specific
+  ngset
+  files=( */filesystem/etc/wireguard/wghole.conf )
+  ngreset
+  cd $initial_dir
+  for f in "${files[@]}"; do
+    host=${f%%/*}
+    if [[ ! ${vpn_ips[$host]} ]]; then
+      e /p/c/machine_specific/$host/filesystem/etc/wireguard/wghole.conf
+      e cedit -s $host /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf '<<<""'
+    fi
+  done
+}
+
+# usage host ipsuf [extrahost]
 #
+# If the keys already exist and you want new ones, remove them:
+# rm /p/c/machine_specific/$host/filesystem/etc/wireguard/hole-{priv,pub}.key
+#
+# extrahost is a host/cidr that is allowed to go be routed through the
+# vpn by this host.
 wghole() {
   if (( $# < 2 || $# > 3 )); then
     e expected 2-3 arg of hostname, ip suffix, and extrahost >&2
@@ -2331,12 +2454,20 @@ wghole() {
   if [[ $3 ]]; then
     extrahost=,$3
   fi
+  for vpn_host in ${!vpn_ips[@]}; do
+    if [[ $vpn_host == "$host" ]]; then
+      continue
+    fi
+    vpn_allowed+=",10.174.${vpn_ips[$vpn_host]}.2/32"
+  done
   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 hole-priv.key | wg pubkey > hole-pub.key
+    if [[ ! -s hole-priv.key || ! -s hole-pub.key ]]; then
+      wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key
+    fi
     cat >wghole.conf <<EOF
 [Interface]
 # contents hole-priv.key
@@ -2345,12 +2476,12 @@ ListenPort = 1194
 Address = 10.8.0.$ipsuf/24
 # https://dev.to/tangramvision/what-they-don-t-tell-you-about-setting-up-a-wireguard-vpn-1h2g
 # ||: makes the systemd service not fail due to the failed command
-PostUp = ping -c1 10.8.0.1 ||:
+PostUp = ping -w10 -c1 10.8.0.1 ||:
 
 [Peer]
 # li. called wgmail on that server
 PublicKey = CTFsje45qLAU44AbX71Vo+xFJ6rt7Cu6+vdMGyWjBjU=
-AllowedIPs = 10.8.0.0/24$extrahost
+AllowedIPs = 10.8.0.0/24$vpn_allowed$extrahost
 Endpoint = 72.14.176.105:1194
 PersistentKeepalive = 25
 EOF
@@ -2360,7 +2491,7 @@ EOF
     cedit -q $host /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf <<EOF || [[ $? == 1 ]]
 [Peer]
 PublicKey = $(cat hole-pub.key)
-AllowedIPs = 10.8.0.$ipsuf/32
+AllowedIPs = 10.8.0.$ipsuf/32,10.174.${vpn_ips[$host]}.2/32
 EOF
   )
 }
@@ -3457,6 +3588,7 @@ calvis() { # calendar visualize
   install -m 600 /dev/null /tmp/calendar-bytes
   while read -r l; do
     for char in $l; do
+      # shellcheck disable=SC2059 # intentional for the hex formatting
       printf "\x$(printf "%x" $char)" >>/tmp/calendar-bytes
     done
   done < <(grep -v '[#-]' /p/calendar-data)
@@ -3504,7 +3636,7 @@ rem() {
        -o -name .hg -prune -o -name .editor-backups -prune \
        -o -name .undo-tree-history -prune \) 2>/dev/null | grep -iP --color=auto "$*"
   rgv -m 5 "$*" $paths ||:
-  }
+}
 
 # setup:
 # pip3 install linode-cli