mostly fixes, some improvements

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 2124a7c968f81d283cd2d7bf7afe35d7eec00969..bcfe627e94d87cd62d704ddeba9111cdb5c19488 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1687,7 +1687,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
@@ -1837,6 +1838,10 @@ EOF
   rm -r "$tmpdir"
 fi
 
+# get rid of annoying message
+s sed -ri "s/^([[:space:]]*ui.print_\('Playing)/#\1/" /usr/share/beets/beetsplug/play.py
+
+
 # notes about barrier
 # run barrier, do the gui config,
 # setup the 2 screens, using hostnames for the new screen.
@@ -1956,11 +1961,6 @@ esac
 ### begin prometheus ###
 
 
-# cleanup old files. 2023-02
-x=(/var/lib/prometheus/node-exporter/*.premerge)
-if [[ -e ${x[0]} ]]; then
-  s rm /var/lib/prometheus/node-exporter/*
-fi
 
 pi prometheus-node-exporter-collectors
 case $HOSTNAME in
@@ -2015,6 +2015,13 @@ EOF
     ;;
 esac
 
+# cleanup old files. 2023-02
+x=(/var/lib/prometheus/node-exporter/*.premerge)
+if [[ -e ${x[0]} ]]; then
+  s rm /var/lib/prometheus/node-exporter/*
+fi
+
+
 case $HOSTNAME in
   # todo, for limiting node exporter http,
   # either use iptables or, in
@@ -2160,7 +2167,10 @@ case $HOSTNAME in
     sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
     sgo bitcoind
     sudo usermod -a -G bitcoin iank
-    sudo ln -s /q/wallets /var/lib/bitcoind
+    if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
+      sudo lnf /q/wallets /var/lib/bitcoind
+      sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
+    fi
     # note, there exists
     # /a/bin/ds/disabled/bitcoin
     ;;
@@ -2168,6 +2178,14 @@ esac
 
 ### end bitcoin
 
+case $HOSTNAME in
+  kw|x3)
+    sd /etc/cups/client.conf <<'EOF'
+ServerName printserver0.office.fsf.org
+EOF
+    ;;
+esac
+
 
 end_msg <<'EOF'
 In mate settings settings, change scrolling to two-finger,