From 3126f27121caaa99903f6e24d1b570884ab91cb8 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sun, 15 Nov 2020 17:41:29 -0500
Subject: [PATCH] various fixes

---
 brc2                                          |  6 ++---
 btrbk-run                                     |  2 +-
 distro-end                                    | 25 -------------------
 dynamic-ip-update                             | 13 +++-------
 .../systemd/system/openvpn-client-tr@.service |  2 +-
 .../system/transmission-daemon-nn.service     | 19 ++++++++++++++
 filesystem/etc/tr-resolv/stub-resolv.conf     |  2 ++
 i3-sway/common.conf                           |  8 +++---
 install-my-scripts                            |  2 +-
 mail-setup                                    | 20 ++++++++-------
 mailtest-check                                |  3 ++-
 subdir_files/.config/i3/config                |  8 +++---
 subdir_files/.config/sway/config              |  8 +++---
 system-status                                 |  2 +-
 14 files changed, 57 insertions(+), 63 deletions(-)
 create mode 100644 filesystem/etc/systemd/system/transmission-daemon-nn.service
 create mode 100644 filesystem/etc/tr-resolv/stub-resolv.conf

diff --git a/brc2 b/brc2
index 5d20970..34fb1dc 100644
--- a/brc2
+++ b/brc2
@@ -175,14 +175,14 @@ anki() {
 
 acat() {
   ngset
-  hrcat /m/md/alerts/new/*
+  hrcat /m/md/alerts/{cur,new}/*
   ngreset
   hr; echo bk; hr
   ssh bk.b8.nz "shopt -s nullglob; hrcat /m/md/INBOX/new/* /m/md/INBOX/cur/*"
 }
 aclear() {
   ngset
-  rm -f /m/md/alerts/new/*
+  rm -f /m/md/alerts/{cur,new}/*
   ngreset
   ssh bk.b8.nz "shopt -s nullglob; rm -f /m/md/INBOX/new/* /m/md/INBOX/cur/*"
   system-status _
@@ -201,7 +201,7 @@ aw() {
 }
 ad() {
   pushd /a/bin/distro-setup/a >/dev/null
-  ansible-playbook site.yml
+  ansible-playbook site.yml "$@"
   popd >/dev/null
 }
 
diff --git a/btrbk-run b/btrbk-run
index 499ec88..7de9255 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -406,7 +406,7 @@ subvolume $sub
 target send-receive $vol/btrbk
 EOF
   fi
-  if (( ${#target[@]} )); then
+  if (( ${#targets[@]} )); then
     cat >>/etc/btrbk.conf <<EOF
 volume $vol
 subvolume $sub
diff --git a/distro-end b/distro-end
index 1c6af3b..390bf55 100755
--- a/distro-end
+++ b/distro-end
@@ -1197,31 +1197,6 @@ if [[ ! -e $f ]]; then
 fi
 
 
-
-# trisquel 8 = openvpn, debian stretch = openvpn-client
-sd /etc/systemd/system/transmission-daemon-nn.service <<EOF
-[Unit]
-Description=Transmission BitTorrent Daemon netns
-After=network.target
-Requires=openvpn-client-tr@client.service
-After=openvpn-client-tr@client.service
-JoinsNamespaceOf=openvpn-client-tr@client.service
-
-[Service]
-User=debian-transmission
-Type=notify
-ExecStart=/usr/bin/transmission-daemon -f --log-error
-ExecReload=/bin/kill -s HUP \$MAINPID
-ExecStop=/bin/kill -s STOP \$MAINPID
-PrivateNetwork=true
-Nice=19
-BindReadOnlyPaths=/etc/nn-resolv:/run/systemd/resolve:norbind /etc/nn-resolv:/etc/nsswitch:norbind
-
-[Install]
-WantedBy=multi-user.target
-EOF
-ser daemon-reload
-
 case $HOSTNAME in
   kd|rp)
     sgo transmission-daemon-nn
diff --git a/dynamic-ip-update b/dynamic-ip-update
index 710c11e..1f9fe4c 100755
--- a/dynamic-ip-update
+++ b/dynamic-ip-update
@@ -11,9 +11,6 @@ case $gateway in
   10.2.0.1)
     dynhost=b8.nz
     ;;
-  10.0.0.1)
-    dynhost=t.b8.nz
-    ;;
   *)
     exit 0
     ;;
@@ -73,16 +70,14 @@ EOF
 fi
 
 if $up6; then
-  if [[ $HOSTNAME == tp ]]; then
-    cat >>$f <<EOF
-update delete $dynhost. AAAA
-update add $dynhost. 60 AAAA $ip6
-EOF
-  fi
   cat >>$f <<EOF
 update delete $fqdn. AAAA
 update add $fqdn. 60 AAAA $ip6
 EOF
+else
+  cat >>$f <<EOF
+update delete $fqdn. AAAA
+EOF
 fi
 
 cat >>$f <<EOF
diff --git a/filesystem/etc/systemd/system/openvpn-client-tr@.service b/filesystem/etc/systemd/system/openvpn-client-tr@.service
index fdd71b1..7a7d130 100644
--- a/filesystem/etc/systemd/system/openvpn-client-tr@.service
+++ b/filesystem/etc/systemd/system/openvpn-client-tr@.service
@@ -26,7 +26,7 @@ ExecStartPre=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns -n 10.173.
 ExecStartPre=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules
 ExecStopPost=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns stop %i
 PrivateNetwork=true
-BindReadOnlyPaths=/etc/nn-resolv:/run/systemd/resolve:norbind /etc/nn-resolv:/etc/nsswitch:norbind
+BindReadOnlyPaths=/etc/tr-resolv:/run/systemd/resolve:norbind /etc/nn-resolv:/etc/nsswitch:norbind
 
 [Install]
 WantedBy=multi-user.target
diff --git a/filesystem/etc/systemd/system/transmission-daemon-nn.service b/filesystem/etc/systemd/system/transmission-daemon-nn.service
new file mode 100644
index 0000000..4f16ec4
--- /dev/null
+++ b/filesystem/etc/systemd/system/transmission-daemon-nn.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Transmission BitTorrent Daemon netns
+After=network.target
+Requires=openvpn-client-tr@client.service
+After=openvpn-client-tr@client.service
+JoinsNamespaceOf=openvpn-client-tr@client.service
+
+[Service]
+User=debian-transmission
+Type=notify
+ExecStart=/usr/bin/transmission-daemon -f --log-error
+ExecReload=/bin/kill -s HUP $MAINPID
+ExecStop=/bin/kill -s STOP $MAINPID
+PrivateNetwork=true
+Nice=19
+BindReadOnlyPaths=/etc/tr-resolv:/run/systemd/resolve:norbind /etc/nn-resolv:/etc/nsswitch:norbind
+
+[Install]
+WantedBy=multi-user.target
diff --git a/filesystem/etc/tr-resolv/stub-resolv.conf b/filesystem/etc/tr-resolv/stub-resolv.conf
new file mode 100644
index 0000000..54f0edd
--- /dev/null
+++ b/filesystem/etc/tr-resolv/stub-resolv.conf
@@ -0,0 +1,2 @@
+nameserver 8.8.8.8
+options edns0
diff --git a/i3-sway/common.conf b/i3-sway/common.conf
index b69c26a..f263a3b 100644
--- a/i3-sway/common.conf
+++ b/i3-sway/common.conf
@@ -11,10 +11,10 @@ bindsym $mod+3 exec "x-www-browser"
 bindsym $mod+4 exec "x-www-browser -no-remote -P firefox-main-profile"
 bindsym $mod+5 exec "/usr/local/bin/start-tor-browser"
 bindsym $mod+6 exec "/a/bin/redshift.sh"
-bindsym $mod+equal exec "t s w; t in"
-bindsym $mod+Home exec "t out"
-#bindsym $mod+End exec "t s x; t in"
-bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
+# bindsym $mod+equal exec "t s w; t in"
+# bindsym $mod+Home exec "t out"
+# #bindsym $mod+End exec "t s x; t in"
+# bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
 
 
 bindsym $mod+w focus parent
diff --git a/install-my-scripts b/install-my-scripts
index ada75a3..25e9c8e 100755
--- a/install-my-scripts
+++ b/install-my-scripts
@@ -35,5 +35,5 @@ x="$(readlink -f -- "${BASH_SOURCE[0]}")"; cd ${x%/*} # directory of this file
 # ran. Very strange, dunno why, but rsync won't do anything unless these
 # changed, so that should fix it.
 rsync -t --chmod=755 --chown=root:root /a/bin/log-quiet/log-once switch-mail-host btrbk-run mount-latest-subvol \
-      check-subvol-stale system-status myi3status /usr/local/bin
+      check-subvol-stale system-status myi3status mailtest-check /usr/local/bin
 rsync -t --chmod=755 --chown=root:root /a/bin/errhandle/err /usr/local/lib
diff --git a/mail-setup b/mail-setup
index 3bfc8b2..ea7ee46 100755
--- a/mail-setup
+++ b/mail-setup
@@ -808,14 +808,19 @@ cat >/etc/exim4/conf.d/rcpt_local_acl <<'EOF'
 # I might add somethign later.
 EOF
 
+i /etc/exim4/conf.d/local_deny_exceptions_acl <<'EOF'
 # This acl already exists in rcpt, this just makes it more widespread.
 # See the comment there for its rationale. The reason it needs to be
 # more widespread is that I've turned on sender verification, but cron
 # emails can fail sender verification since I may be in a network that
 # doesn't have my local dns.
-i /etc/exim4/conf.d/local_deny_exceptions_acl <<'EOF'
 accept
   authenticated = *
+
+# i setup a local programs smtp to mail.iankelling.org, this
+# skips sender verification for it.
+accept
+  hosts = 10.173.8.1
 EOF
 
 rm -fv /etc/exim4/data_local_acl # old path
@@ -1853,14 +1858,13 @@ EOF
 # I originally set this to li.iankelling.org, but then ended up with errors when li tried to send
 # mail to kd, so this should basically be a name that no host has as their
 # canonical hostname since the actual host sits behind a nat and changes.
-# Seems logical for this to be the same as mailname.
 MAIN_HARDCODE_PRIMARY_HOSTNAME = mail.iankelling.org
+# I used this to avoid sender verification, didnt work but it still
+# makes sense based on the spec.
+hosts_treat_as_local = defaultnn.b8.nz
 EOF
 
     /a/exe/cedit defaultnn /etc/hosts <<'EOF' || [[ $? == 1 ]]
-# this is just here to avoid mainlog errors, however, it doesnt seem to work
-# todo: look into it more. nsswitch.conf? cached result? i dunno
-# list matching forced to fail: failed to find host name for 10.173.8.1
 10.173.8.1 defaultnn.b8.nz
 EOF
     ;;&
@@ -1955,9 +1959,7 @@ EOF
     # file, so I've saved that into ./mail-notes.conf.
     cat >>/etc/exim4/update-exim4.conf.conf <<EOF
 # man page: is used to build the local_domains list, together with "localhost"
-# iank.bid is for testing
-# mail.iankelling.org is for machines i own
-# this is duplicated in a later router
+# this is duplicated in a later router.
 dc_other_hostnames='iankelling.org;zroe.org;r2e.iankelling.org'
 EOF
 
@@ -1989,7 +1991,7 @@ EOF
 vpnmanual:
   debug_print = "R: dnslookup for $local_part@$domain"
   driver = manualroute
-  domains = iankelling.org:zroe.org:r2e.iankelling.org
+  domains = iankelling.org : zroe.org:r2e.iankelling.org
   transport = remote_smtp
   same_domain_copy_routing = yes
   route_list = * 10.8.0.4
diff --git a/mailtest-check b/mailtest-check
index e8f146d..38cfc91 100755
--- a/mailtest-check
+++ b/mailtest-check
@@ -110,7 +110,7 @@ for folder in ${folders[@]}; do
             fi
           done
           if (( ${#results[@]} || ${#missing[@]} )); then
-            printf "$HOSTNAME spamtest %s %s/%s\n" "$folder" "$latest"
+            printf "$HOSTNAME spamtest %s/%s\n" "$folder" "$latest"
             if (( ${#results[@]} )); then
               printf "unexpected %s" "${!results[*]} "
             fi
@@ -118,6 +118,7 @@ for folder in ${folders[@]}; do
               printf "missing %s" "${missing[*]}"
             fi
             echo
+            spamassassin -D <"$latest"
           fi
         else
           echo $HOSTNAME mailtest spamd pid not found
diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config
index 4ba0674..9948f38 100644
--- a/subdir_files/.config/i3/config
+++ b/subdir_files/.config/i3/config
@@ -11,10 +11,10 @@ bindsym $mod+3 exec "x-www-browser"
 bindsym $mod+4 exec "x-www-browser -no-remote -P firefox-main-profile"
 bindsym $mod+5 exec "/usr/local/bin/start-tor-browser"
 bindsym $mod+6 exec "/a/bin/redshift.sh"
-bindsym $mod+equal exec "t s w; t in"
-bindsym $mod+Home exec "t out"
-#bindsym $mod+End exec "t s x; t in"
-bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
+# bindsym $mod+equal exec "t s w; t in"
+# bindsym $mod+Home exec "t out"
+# #bindsym $mod+End exec "t s x; t in"
+# bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
 
 
 bindsym $mod+w focus parent
diff --git a/subdir_files/.config/sway/config b/subdir_files/.config/sway/config
index 71a7fd3..bb9712e 100644
--- a/subdir_files/.config/sway/config
+++ b/subdir_files/.config/sway/config
@@ -11,10 +11,10 @@ bindsym $mod+3 exec "x-www-browser"
 bindsym $mod+4 exec "x-www-browser -no-remote -P firefox-main-profile"
 bindsym $mod+5 exec "/usr/local/bin/start-tor-browser"
 bindsym $mod+6 exec "/a/bin/redshift.sh"
-bindsym $mod+equal exec "t s w; t in"
-bindsym $mod+Home exec "t out"
-#bindsym $mod+End exec "t s x; t in"
-bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
+# bindsym $mod+equal exec "t s w; t in"
+# bindsym $mod+Home exec "t out"
+# #bindsym $mod+End exec "t s x; t in"
+# bindsym $mod+grave exec "t s lunch; t in; t out -a '45 minutes from now'"
 
 
 bindsym $mod+w focus parent
diff --git a/system-status b/system-status
index 93d31e4..adf8dd5 100644
--- a/system-status
+++ b/system-status
@@ -63,7 +63,7 @@ write-status() {
     bouncemsg="message in /m/md/bounces/new"
   fi
   lo -1 bounce $bouncemsg
-  glob=(/m/md/alerts/new/*)
+  glob=(/m/md/alerts/{new,cur}/*)
   if [[ -e ${glob[0]} ]]; then
     chars+=("A")
   fi
-- 
2.30.2