X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=02aa77f694d82e89289ce521761cd37978b0b8fb;hb=fa5deaee2e0182ddfc7b39eea7ee2acedb259ddf;hp=6b977839c870f2a4d37c0ae8bc3a3cc31aebe250;hpb=d7551546ac323c5d4b49370c885646bcf96e959f;p=distro-setup

diff --git a/brc2 b/brc2
index 6b97783..02aa77f 100644
--- a/brc2
+++ b/brc2
@@ -12,6 +12,8 @@ source /a/bin/distro-setup/path-add-function
 path-add /a/exe
 # add this with absolute paths as needed for better security
 #path-add --end /path/to/node_modules/.bin
+## for yarn, etc
+#path-add --end /usr/lib/node_modules/corepack/shims/
 
 # pip3 --user things go here:
 path-add --end ~/.local/bin
@@ -502,27 +504,26 @@ EOF
   done
 }
 bindpushb8() {
-  dsign iankelling.org expertpathologyreview.com zroe.org amnimal.ninja
   lipush
   for h in li bk; do
     m sl $h <<'EOF'
 source ~/.bashrc
-m dnsup
 m dnsb8
 EOF
   done
 }
 
 dnsup() {
-  conflink
+  conflink -f
   m ser reload bind9
 }
 dnsb8() {
   local f=/var/lib/bind/db.b8.nz
-  ser stop bind9
-  sudo rm -fv $f.jnl
-  sudo install -m 644 -o bind -g bind /p/c/machine_specific/vps/bind-initial/db.b8.nz $f
-  ser restart bind9
+  m ser stop bind9
+  m sleep 1
+  m sudo rm -fv $f.jnl
+  m sudo install -m 644 -o bind -g bind /p/c/machine_specific/vps/bind-initial/db.b8.nz $f
+  m ser restart bind9
 }
 dnsecgen() {
   # keys generated like this
@@ -972,10 +973,9 @@ hstatus() {
 # work log
 wlog() {
   local day now i
-  now=$(date +%s)
   for (( i=0; i<60; i++ )); do
-    day=$( date +%F -d @$((now - 86400*i )) )
-    date "+%a %b %d" -d @$((now - 86400*i )) | tr '\n' ' '
+    day=$( date +%F -d @$((EPOCHSECONDS - 86400*i )) )
+    date "+%a %b %d" -d @$((EPOCHSECONDS - 86400*i )) | tr '\n' ' '
     /a/opt/timetrap/bin/t d -ftotal -s $day -e $day all -m '^w|lunch$'
   done
 }
@@ -1075,8 +1075,8 @@ Address = 10.8.0.$ipsuf/24
 PostUp = ping -c1 10.8.0.1 ||:
 
 [Peer]
-# li
-PublicKey = zePGl7LoS3iv6ziTI/k8BMh4L3iL3K2t9xJheMR4hQA=
+# li. called wgmail on that server
+PublicKey = CTFsje45qLAU44AbX71Vo+xFJ6rt7Cu6+vdMGyWjBjU=
 AllowedIPs = 10.8.0.0/24
 Endpoint = 72.14.176.105:1194
 PersistentKeepalive = 25
@@ -1084,7 +1084,7 @@ EOF
   umask $umask_orig
   # old approach. systemd seems to work fine and cleaner.
   rm -f ../network/interfaces.d/wghole
-  cedit -q $host /p/c/machine_specific/li/filesystem/etc/wireguard/wghole.conf <<EOF || [[ $? == 1 ]]
+  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
@@ -1233,8 +1233,7 @@ allmyirc() {
 }
 
 mygajim() {
-  local now time time_sec time_pretty
-  now=$(date +%s)
+  local time time_sec time_pretty
   sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank' and jid_id = 17;" | while read -r time l; do
     case $time in
       16*) : ;;
@@ -1247,7 +1246,7 @@ mygajim() {
     echo $time_pretty "$l"
     time_sec=${time%%.*}
     # only look at the last 18 days. generally just use this for timesheet.
-    if (( time_sec < now - 60 * 60 * 24 * 18 )); then break; fi
+    if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * 18 )); then break; fi
   done
 }
 
@@ -1524,14 +1523,14 @@ daylertme() {
   if [[ -t 0 ]]; then
     exim -t <<EOF
 From: alertme@b8.nz
-To: daylerts@iankelling.org
+To: daylert@iankelling.org
 Subject: $*
 EOF
   else
     read sub
     { cat <<EOF
 From: alertme@b8.nz
-To: daylerts@iankelling.org
+To: daylert@iankelling.org
 Subject: $sub
 
 EOF
@@ -1549,7 +1548,7 @@ alert200() {
     if torsocks wget -q "$url"; then
       alertme $tmpdir
     fi
-    sleep 600 + $(( RANDOM % 300 ))
+    sleep $(( 600 + RANDOM % 300 ))
   done
 }
 
@@ -1648,18 +1647,24 @@ enn() {
 
 sdnbash() { # systemd namespace bash
   local unit=$1
-  m sudo nsenter -t $(systemctl show --property MainPID --value $unit') -n -m sudo -u $USER -i bash
+  m sudo nsenter -t $(systemctl show --property MainPID --value $unit) -n -m sudo -u $USER -i bash
 }
 
 mailnnbash() {
-  m sudo nsenter -t $(systemctl show --property MainPID --value mailnn') -n -m sudo -u $USER -i bash
+  m sudo nsenter -t $(systemctl show --property MainPID --value mailnn) -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
 }
 eximbash() {
-  m sudo nsenter -t $(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1) -n -m sudo -u $USER -i bash
+  local pid
+  pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1)
+  if [[ ! $pid ]]; then
+    echo "eximbash: failed to find exim pid. systemctl -n 30 status exim4:"
+    systemctl status exim4
+  fi
+  m sudo nsenter -t $pid -n -m
 }
 spamnn() {
   local spamdpid
@@ -1742,6 +1747,11 @@ vpn() {
   sudo systemd-tty-ask-password-agent
 }
 
+fixu() {
+  ls -lad /run/user/1000
+  s chmod 700 /run/user/1000; s chown iank.iank /run/user/1000
+}
+
 # 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: