various fixes and improvements

diff --git a/brc b/brc
index f0ae687d29cd6173c4735e937d1b96d8a23daf99..f003263c7e37a8a187def9b2a3994003c39e9394 100644 (file)
--- a/brc
+++ b/brc
@@ -157,6 +157,7 @@ HISTIGNORE='pass *:[ ]*:lom*:gram*'
 
 export BC_LINE_LENGTH=0
 
+export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100
 
 # note, if I use a machine I dont want files readable by all users, set
 # umask 077  # If fewer than 4 digits are entered, leading zeros are assumed
@@ -623,7 +624,7 @@ envload() { # load environment from a previous: export > file
 
 # mail related
 etail() {
-  sudo tail -f /var/log/exim4/mainlog
+  sudo tail -F /var/log/exim4/mainlog -n 50
 }
 
 f() {
@@ -1676,7 +1677,7 @@ splay() { # script replay
   scriptreplay "$1.t" "$1.s"
 }
 
-smeld() { # usage host1 host2 file
+smeld() { # ssh meld usage host1 host2 file
   meld <(ssh $1 cat $3) <(ssh $2 cat $3)
 }
 
@@ -2026,6 +2027,8 @@ xl() {
   xscreensaver-command -activate
 }
 
+xevkb() { xev -event keyboard; }
+
 # * misc stuff
 
 # from curl cheat.sh/:bash_completion
@@ -2292,6 +2295,10 @@ export GOPATH=$HOME/go
 path_add $GOPATH/bin
 path_add /usr/local/go/bin
 
+# I have the git repo and a release. either one should work.
+# I have both because I was trying to solve an issue that
+# turned out to be unrelated.
+# ARDUINO_PATH=/a/opt/Arduino/build/linux/work
 export ARDUINO_PATH=/a/opt/arduino-1.8.9
 
 path_add --end ~/.npm-global

diff --git a/btrbk-run b/btrbk-run
index a5fd62a45c54bbbd592d570654c2ceca13fa3c9c..6908018f61fbafda774339f4f299699e479a388b 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -255,10 +255,10 @@ else
 
   sshable=()
   sshfail=()
-  min_idle=$((60 * 15))
+  min_idle_ms=$((1000 * 60 * 15))
   for h in ${targets[@]}; do
     if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
-      if $cron && xidle=$(ssh iank@$h DISPLAY=:0 xprintidle) && [[ $xidle && $xidle -lt $min_idle ]]; then
+      if $cron && DISPLAY=:0 xprintidle; then
         # This is a separate ssh because xprintidle can fail and thats ok.
         # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that
         # everything will be wiped by the next backup, but I dont want it to happen as Im using

diff --git a/distro-end b/distro-end
index 64441d1cfc9d477847610a3158b8b72ac2f6a438..0e7c4b8197dab344b80a00602e76365deaa84dfa 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -609,25 +609,27 @@ fi
 sgo fsf-vpn-dns-cleanup
 
 
-case $distro in
-  debian)
-    pi chromium ;;
-  trisquel|ubuntu)
-    wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
-    t=$(mktemp)
-    cat >$t <<EOF
-deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main
-#deb-src https://downloads.iridiumbrowser.de/deb/ stable main
-EOF
-    f=/etc/apt/sources.list.d/iridium-browser.list
-    if ! diff -q $t $f; then
-      s cp $t $f
-      s chmod 644 $f
-      p update
-    fi
-    pi iridium-browser
-    ;;
-esac
+# website is dead june 14 2019
+s rm -f /etc/apt/sources.list.d/iridium-browser.list
+# case $distro in
+#   debian)
+#     pi chromium ;;
+#   trisquel|ubuntu)
+#     wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add -
+#     t=$(mktemp)
+#     cat >$t <<EOF
+# deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main
+# #deb-src https://downloads.iridiumbrowser.de/deb/ stable main
+# EOF
+#     f=/etc/apt/sources.list.d/iridium-browser.list
+#     if ! diff -q $t $f; then
+#       s cp $t $f
+#       s chmod 644 $f
+#       p update
+#     fi
+#     pi iridium-browser
+#     ;;
+# esac
 
 
 ### begin home vpn server setup
@@ -729,6 +731,9 @@ EOF
 fi
 #########  end  pump.io periodic backup #############
 
+# https://github.com/jlebon/textern
+cd /a/opt/textern
+make native-install USER=1
 
 case $distro in
   debian|trisquel|ubuntu)

diff --git a/filesystem/etc/ansible/ansible.cfg b/filesystem/etc/ansible/ansible.cfg
index d233caa429cca74479eead28d43673eb32c405a7..4ba07f503747002267ddfd6c0bf730f969278a58 100644 (file)
--- a/filesystem/etc/ansible/ansible.cfg
+++ b/filesystem/etc/ansible/ansible.cfg
@@ -16,7 +16,7 @@ remote_user = root
 # readable output
 stdout_callback = yaml
 # show execution time
-callback_whitelist = timer, profile_tasks
+callback_whitelist = timer, profile_tasks, profile_roles
 
 
 [ssh_connection]

diff --git a/machine_specific/btrbk/filesystem/etc/systemd/system/btrbk.service b/machine_specific/btrbk/filesystem/etc/systemd/system/btrbk.service
index 299ecff51e2b85db8f3e066c1c3623deccef42e8..b1d2dd8982d3f3c02b79d83ea23331b9619de27f 100644 (file)
--- a/machine_specific/btrbk/filesystem/etc/systemd/system/btrbk.service
+++ b/machine_specific/btrbk/filesystem/etc/systemd/system/btrbk.service
@@ -4,6 +4,6 @@ After=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/install-my-scripts
+ExecStart=/a/exe/install-my-scripts
 ExecStart=/a/bin/log-quiet/sysd-mail-once btrbk /usr/local/bin/btrbk-run -q --cron
 ExecStart=/usr/local/bin/install-my-scripts

diff --git a/mail-setup b/mail-setup
index f43b6ba8b136ab697a19b210c5fd10b1109c87e9..ffc4bf17058bffa9d8752a4cd14204971356ee9a 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -702,6 +702,13 @@ IGNORE_SMTP_LINE_LENGTH_LIMIT = true
 # keep your dkim signature intact but add list- headers.
 DKIM_SIGN_HEADERS = mime-version:in-reply-to:references:from:date:subject:to
 
+# recommended if dns is expected to work
+CHECK_RCPT_VERIFY_SENDER = true
+# seems like a good idea
+CHECK_DATA_VERIFY_HEADER_SENDER = true
+CHECK_RCPT_SPF = true
+CHECK_RCPT_REVERSE_DNS = true
+CHECK_MAIL_HELO_ISSUED = true
 EOF
 
 
@@ -866,7 +873,7 @@ EOF
 
 
   # light version of exim does not have sasl auth support.
-  pi exim4-daemon-heavy spamassassin
+  pi exim4-daemon-heavy spamassassin spf-tools-perl
 
 
 

diff --git a/pkgs b/pkgs
index 3b7754debe1a3061be082f0e8df12e0440d4cea4..bbed4cab7a65dd63ef1fae1cfb3817670d302584 100644 (file)
--- a/pkgs
+++ b/pkgs
@@ -61,6 +61,7 @@ p4=(
   apt-doc
   apt-listchanges
   apt-rdepends
+  apt-show-versions
   aptitude-doc-en
   asciidoc
   backupninja