X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=4452a3be547a215c162b40b032596847a3ea679b;hb=dc34d23c63cd83a7cc7a79525445aad3293c7241;hp=a9ab55a1e2ce3fd602960cdf9f543598ee9bcf3f;hpb=279890b457806c91686cf04e3426b8c951c244eb;p=distro-setup

diff --git a/distro-end b/distro-end
index a9ab55a..4452a3b 100755
--- a/distro-end
+++ b/distro-end
@@ -90,7 +90,6 @@ EOF
 ########### begin section including vps ################
 pi ${p2[@]}
 
-
 conflink
 
 sudo rm -fv
@@ -620,8 +619,7 @@ case $HOSTNAME in
       dnsb8
     fi
 
-    pi prometheus-node-exporter
-    /a/bin/buildscripts/prom-node-exporter -l
+    s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter -l
 
     # ex for exporter
     web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF'
@@ -715,6 +713,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/
@@ -886,10 +888,12 @@ 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
+esac
 
 ###### end website setup
 
@@ -1603,6 +1607,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.
@@ -1957,6 +1964,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
 
@@ -1970,12 +1981,11 @@ esac
 
 
 
-pi prometheus-node-exporter-collectors
 case $HOSTNAME in
   kd)
     # Font awesome is needed for the alertmanager ui.
     pi prometheus-alertmanager prometheus fonts-font-awesome
-    /a/bin/buildscripts/prometheus
+    /c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus
     web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
 <Location "/">
 AuthType Basic
@@ -2011,7 +2021,7 @@ EOF
       ser restart prometheus-alertmanager
     fi
 
-    /a/bin/buildscripts/prom-node-exporter -l
+    s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter -l
 
     for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
       sysd-prom-fail-install $ser
@@ -2019,7 +2029,7 @@ EOF
 
     ;;
   *)
-    /a/bin/buildscripts/prom-node-exporter
+    s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter
     ;;
 esac
 
@@ -2074,9 +2084,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:
@@ -2122,7 +2135,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
@@ -2165,18 +2178,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