From 88d40e435fe7d525e033558101f0c0a8101c27b2 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Fri, 10 May 2019 13:53:06 -0400
Subject: [PATCH] minor improvements

---
 brc                       | 6 +++++-
 btrbk-run                 | 3 ++-
 filesystem/etc/cron.d/ian | 2 +-
 mail-setup                | 3 ++-
 pkgs                      | 4 ++++
 switch-mail-host          | 8 +-------
 6 files changed, 15 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 filesystem/etc/cron.d/ian

diff --git a/brc b/brc
index 1c93c8a..c243706 100644
--- a/brc
+++ b/brc
@@ -167,6 +167,7 @@ C_DEFAULT_DIR=/a
 # https://superuser.com/questions/366930/how-do-i-get-the-git-pager-to-clean-up-screen-output-after-exit
 # and reading the man
 export LESS=RXi
+export SYSTEMD_LESS=$LESS
 
 # * include files
 for _x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do
@@ -340,6 +341,7 @@ b() {
 }
 
 bbk() {
+  c /
   # run latest
   install-my-scripts
   btrbk-run "$@"
@@ -1085,6 +1087,8 @@ ipdrop() {
   s iptables -A INPUT -s $1 -j DROP
 }
 
+jr() { journalctl "$@"; }
+
 net-dev-info() {
   e "lspci -nnk|gr -iA2 net"
   lspci -nnk|gr -iA2 net
@@ -1484,7 +1488,7 @@ scssl() {
 }
 
 ser() {
-  local s; [[ $EUID != 0 ]] && s=sudo
+  local s; [[ $EUID != 0 ]] && s=s
   if type -p systemctl &>/dev/null; then
     $s systemctl $1 $2
   else
diff --git a/btrbk-run b/btrbk-run
index f0f16bd..59631fd 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -105,7 +105,8 @@ if ! $pull_reexec && [[ $source ]]; then
   if diff -q $tmpf $BASH_SOURCE; then
     echo "$0: found newer version on host $source. reexecing"
     install -T $tmpf /usr/local/bin/btrbk-run
-    /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
+    m /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
+    exit
   fi
 fi
 
diff --git a/filesystem/etc/cron.d/ian b/filesystem/etc/cron.d/ian
old mode 100755
new mode 100644
index 53b357a..343c25b
--- a/filesystem/etc/cron.d/ian
+++ b/filesystem/etc/cron.d/ian
@@ -1,2 +1,2 @@
 SHELL=/bin/bash
-*/10 * * * *   iank /a/exe/rootsshsync 2>&1 | /usr/local/bin/log-once -15
+*/10 * * * *   iank /a/exe/rootsshsync 2>&1 | /usr/local/bin/log-once -15 rootsshsync
\ No newline at end of file
diff --git a/mail-setup b/mail-setup
index c1db3c7..babbbd8 100755
--- a/mail-setup
+++ b/mail-setup
@@ -642,7 +642,8 @@ EOF
     # MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the
     # smarthost config type, not sure. all other settings
     # would be unused in that config type.
-    cat >/etc/exim4/conf.d/main/000_localmacros <<EOF
+    rm -f /etc/exim4/conf.d/main/000_localmacros # old filename
+    cat >/etc/exim4/conf.d/main/000_local <<EOF
 # i don't have ipv6 setup for my vpn tunnel yet.
 disable_ipv6 = true
 
diff --git a/pkgs b/pkgs
index 602ee29..d52a3f2 100644
--- a/pkgs
+++ b/pkgs
@@ -51,6 +51,8 @@ p3=(
 # libterm-readkey-perl for rt cli tool
 # fonts pkgs are an attempt to get less block characters
 # gnat-5 & ccache is for coreboot
+# python-dnspython is needed by some ansible module and 3 is
+# for when ansible becomes py3.
 p4=(
   adb
   ansible
@@ -79,6 +81,8 @@ p4=(
   dirmngr
   dnsutils
   dnsmasq
+  python-dnspython
+  python3-dnspython
   dtrx
   duplicity
   eclipse
diff --git a/switch-mail-host b/switch-mail-host
index a06e1ba..2882112 100755
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -89,14 +89,8 @@ source /a/bin/bash_unpublished/source-semi-priv
 # todo: setup vpn so this is all taken care of.
 if ! $update_wrt; then
   wrt_shell=:
-elif $at_home; then
-  wrt_shell="ssh wrt.b8.nz"
 else
-  if [[ $old_host == iank.vpn.office.fsf.org || $new_host == iank.vpn.office.fsf.org ]]; then
-    wrt_shell="ssh iank.vpn.office.fsf.org ssh wrt.b8.nz"
-  else
-    wrt_shell="ssh $HOME_DOMAIN ssh wrt.b8.nz"
-  fi
+  wrt_shell="ssh wrt.b8.nz"
 fi
 
 btrbk_test="systemctl is-active btrbk.service"
-- 
2.30.2