mostly features, some minor bug fixes

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 6f7b8718f5f96cb4c685963e738bf3f8237dd9e8..bc8b474cfdaf4fe5c7c21bbae93ee5e9c2906318 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -90,7 +90,6 @@ EOF
 ########### begin section including vps ################
 pi ${p2[@]}
 
-
 conflink
 
 sudo rm -fv
@@ -715,6 +714,10 @@ EOF
     #
     # for wireguard hole vpn, use function:
     # wghole
+    # eg:
+    # wghole bo 28
+    # if it is going to want to connect to transmission-daemon on ok
+    # wghole bo 28 10.173.0.2/32
 
     # requested from linode via a support ticket.
     # https://www.linode.com/docs/networking/an-overview-of-ipv6-on-linode/
@@ -883,6 +886,16 @@ EOF
     end
     ;;
 esac
+
+case $HOSTNAME in
+  bk)
+    pi icecast2
+    # todo, save the config
+    /etc/cron.daily/stream-cert
+    web-conf -c /etc/cert-live.fsf.org -p 443 -f 8000 apache2 live.fsf.org
+    ;;
+esac
+
 ###### end website setup
 
 ########### end section including li/lj ###############
@@ -1595,6 +1608,9 @@ esac
 
 ######### begin transmission client setup ######
 
+# to connect from a remote client, trans-remote-route in brc2
+
+
 if [[ -e /p/transmission-rpc-pass ]]; then
   # arch had a default config,
   # debian had nothing until you start it.
@@ -1687,7 +1703,8 @@ sudo gpasswd -a $USER lpadmin # based on ubuntu wiki
 # general known for debian/ubuntu, not for fedora
 
 m /a/bin/buildscripts/go
-m /a/bin/buildscripts/rust
+# only needed for rg. cargo takes up 11 gigs, filled up the disk on je.
+#m /a/bin/buildscripts/rust
 m /a/bin/buildscripts/misc
 m /a/bin/buildscripts/pithosfly
 #m /a/bin/buildscripts/alacritty
@@ -1948,6 +1965,10 @@ sgo dynamicipupdate
 if grep -xFq $HOSTNAME /a/bin/ds/machine_specific/btrbk.hosts; then
   sgo btrbk.timer
 fi
+if [[ $HOSTNAME == kd ]]; then
+  sgo btrbk-spread.timer
+fi
+
 # note: to see when it was last run,
 # ser list-timers
 
@@ -2065,9 +2086,12 @@ esac
 
 ### begin nagios ###
 
+pi nagios-nrpe-server
+
 case $HOSTNAME in
   kd)
-    pi nagios4
+    # the backport is for this bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800345
+    pi nagios4 nagios-nrpe-plugin monitoring-plugins-basic/bullseye-backports
     s rm -fv /etc/apache2/conf-enabled/nagios4-cgi.conf
 
     # to add a password for admin:
@@ -2113,7 +2137,7 @@ Alias /nagios4 /usr/share/nagios4/htdocs
     #
        AuthDigestDomain "Nagios4"
        AuthDigestProvider file
-       AuthUserFile    "/etc/nagios4/htdigest.users"
+       AuthUserFile    "/etc/nagios4-htdigest.users"
        AuthGroupFile   "/etc/group"
        AuthName        "Nagios4"
        AuthType        Digest
@@ -2156,18 +2180,21 @@ esac
 #       6 define timeperiod
 
 
+
+
 ### end nagios ###
 
 ### begin bitcoin ###
 
 case $HOSTNAME in
-  sy)
-    f=$dir/bitcoin.conf
-    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
+  sy|kd)
+    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.0.1/bin/*
     sgo bitcoind
+    # note: the bitcoin user & group are setup in fai
     sudo usermod -a -G bitcoin iank
+    # todo: make bitcoin have a stable uid/gid
     if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
-      sudo lnf /q/wallets /var/lib/bitcoind
+      s lnf /q/wallets /var/lib/bitcoind
       sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
     fi
     # note, there exists