minor fixes

diff --git a/le-dns-challenge b/le-dns-challenge
index 644ccf35e58133142f9acb445d4fd2caedb14ca4..6cabe7ce3bde03e160c9a89a3c1fc18f021c78ff 100755 (executable)
--- a/le-dns-challenge
+++ b/le-dns-challenge
@@ -34,6 +34,7 @@ answer
 quit
 EOF
 
-nsupdate -k /p/c/machine_specific/vps/filesystem/etc/bind/Kb8.nz.*.private <$f
+fn() { nsupdate -k /p/c/user-specific/bind/etc/bind/Kb8.nz.*.private <$f; }
+fn
 sed -i 's/^server .*/server bk.b8.nz/' $f
-nsupdate -k /p/c/machine_specific/vps/filesystem/etc/bind/Kb8.nz.*.private <$f
+fn

diff --git a/le-dns-challenge-cleanup b/le-dns-challenge-cleanup
index de07804279e5beb12fa14bceb171b640b5809c64..14facbe83b95a14ce2f6f874fdab274265433b42 100755 (executable)
--- a/le-dns-challenge-cleanup
+++ b/le-dns-challenge-cleanup
@@ -34,6 +34,7 @@ answer
 quit
 EOF
 
-nsupdate -k /p/c/machine_specific/vps/filesystem/etc/bind/Kb8.nz.*.private <$f
+fn() { nsupdate -k /p/c/user-specific/bind/etc/bind/Kb8.nz.*.private <$f; }
+fn
 sed -i 's/^server .*/server bk.b8.nz/' $f
-nsupdate -k /p/c/machine_specific/vps/filesystem/etc/bind/Kb8.nz.*.private <$f
+fn

diff --git a/mail-setup b/mail-setup
index 2fb12eb579ee74c389e0e01b1e452a83031c2a32..38a681f96006e31be373e5af33b9c292d8bbe9fc 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -432,7 +432,7 @@ fi
 bhost_t=false
 case $HOSTNAME in
   $MAIL_HOST) : ;;
-  kd|x2|x3|kw|sy|bo|so)
+  kd|x2|x3|kw|sy|bo|so|frodo)
     bhost_t=true
     ;;
 esac
@@ -1505,8 +1505,8 @@ hostlist iank_trusted = <; \
 85.119.83.50 ; 2001:ba8:1f1:f0c9::2 ; \
 # je je_ipv6
 85.119.82.128 ; 2001:ba8:1f1:f09d::2 ; \
-# fsf_mit_net fsf_mit_net_ip6 fsf_net fsf_net_ip6 fsf_office_net
-18.4.89.0/24 ; 2603:3005:71a:2e00::/64 ; 209.51.188.0/24 ; 2001:470:142::/48 ; 74.94.156.208/28
+# fsf_mit_net fsf_mit_net_ip6 fsf_net fsf_net_ip6
+18.4.89.0/24 ; 2603:3005:71a:2e00::/64 ; 209.51.188.0/24 ; 2001:470:142::/48
 
 
 # this is the default delay_warning_condition, plus matching on local_domains.
@@ -1830,12 +1830,12 @@ tls_privatekey = REMOTE_SMTP_PRIVATEKEY
 .endif
 
 EOF
-# os needs an update, doesn't have this setting in exim yet.
-if [[ $HOSTNAME != li ]]; then
-  cat <<'EOF'
+  # os needs an update, doesn't have this setting in exim yet.
+  if [[ $HOSTNAME != li ]]; then
+    cat <<'EOF'
   message_linelength_limit = 2097152
 EOF
-fi
+  fi
 } | u /etc/exim4/conf.d/transport/30_exim4-config_remote_smtp
 
 {
@@ -1880,12 +1880,12 @@ tls_privatekey = REMOTE_SMTP_SMARTHOST_PRIVATEKEY
   headers_remove = REMOTE_SMTP_TRANSPORTS_HEADERS_REMOVE
 .endif
 EOF
-# os needs an update, doesn't have this setting in exim yet.
-if [[ $HOSTNAME != li ]]; then
-  cat <<'EOF'
+  # os needs an update, doesn't have this setting in exim yet.
+  if [[ $HOSTNAME != li ]]; then
+    cat <<'EOF'
   message_linelength_limit = 2097152
 EOF
-fi
+  fi
 } | u /etc/exim4/conf.d/transport/30_backup_remote
 
 u /etc/exim4/conf.d/router/900_exim4-config_local_user <<'EOF'
@@ -1973,12 +1973,12 @@ tls_privatekey = REMOTE_SMTP_PRIVATEKEY
 .endif
   interface = <; 10.8.0.4 ; 2600:3c00:e002:3800::4
 EOF
-# os needs an update, doesn't have this setting in exim yet.
-if [[ $HOSTNAME != li ]]; then
-  cat <<'EOF'
+  # os needs an update, doesn't have this setting in exim yet.
+  if [[ $HOSTNAME != li ]]; then
+    cat <<'EOF'
   message_linelength_limit = 2097152
 EOF
-fi
+  fi
 } | u /etc/exim4/conf.d/transport/30_remote_smtp_vpn
 
 {
@@ -2047,12 +2047,12 @@ dkim_strict = DKIM_STRICT
 dkim_sign_headers = DKIM_SIGN_HEADERS
 .endif
 EOF
-# os needs an update, doesn't have this setting in exim yet.
-if [[ $HOSTNAME != li ]]; then
-  cat <<'EOF'
+  # os needs an update, doesn't have this setting in exim yet.
+  if [[ $HOSTNAME != li ]]; then
+    cat <<'EOF'
   message_linelength_limit = 2097152
 EOF
-fi
+  fi
 } | u /etc/exim4/conf.d/transport/30_smarthost_dkim
 
 cat >/etc/exim4/update-exim4.conf.conf  <<'EOF'
@@ -3747,7 +3747,6 @@ EOF
     echo | /a/exe/cedit nn /etc/hosts || [[ $? == 1 ]]
     echo | /a/exe/cedit mail /etc/dnsmasq-servers.conf || [[ $? == 1 ]]
 
-    # note: condition duplicated at else
     if $bhost_t; then
       install -d /bu
       install -d -g Debian-exim -o Debian-exim -m 771 /bu/md
@@ -3779,13 +3778,11 @@ backup_local:
 EOF
 
       # Bind to wghole to receive mailbackup.
-      if [[ -e /etc/wireguard/wghole.conf ]]; then
-        wgholeip=$(sed -rn 's/^ *Address *= *([^/]+).*/\1/p' /etc/wireguard/wghole.conf)
-        cat >>/etc/exim4/update-exim4.conf.conf <<EOF
+      wgholeip=$(sed -rn 's/^ *Address *= *([^/]+).*/\1/p' /etc/wireguard/wghole.conf)
+      cat >>/etc/exim4/update-exim4.conf.conf <<EOF
 dc_other_hostnames='eximbackup.b8.nz'
 dc_local_interfaces='127.0.0.1;::1;$wgholeip'
 EOF
-      fi
 
       # wghole & thus exim will fail to start without internet connectivity.
       u /etc/systemd/system/exim4.service.d/backup.conf <<'EOF'
@@ -3797,7 +3794,7 @@ Restart=always
 RestartSec=20
 EOF
 
-    else  # if $bhost_t; then
+    else
       cat >>/etc/exim4/update-exim4.conf.conf <<EOF
 # Note: If theres like a temporary problem where mail gets sent to
 # one of these hosts, if exim isnt listening, it will be a temporary error