mostly profanity and fixes

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 02b593755aef13000eb7b3adbfc91798d3220a6d..ed90a3f4446fb39bd5e344a322a8cf0c6d343ec9 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1277,6 +1277,22 @@ fi
 
 ####### begin misc packages ###########
 
+case $HOSTNAME in
+  kd)
+    ln -sfT /d/p/profanity ~/.local/share/profanity
+    ln -sfT /d/p/profanity-config ~/.config/profanity
+    source /a/bin/bash_unpublished/source-state
+    if [[ $HOSTNAME == "$HOST2" ]]; then
+      systemctl --now enable profanity
+    fi
+    ;;
+  *)
+
+    ln -sfT /p/profanity ~/.local/share/profanity
+    ln -sfT /p/profanity-config ~/.config/profanity
+    ;;
+esac
+
 # template
 case $codename in
   flidas)
@@ -1962,6 +1978,8 @@ case $HOSTNAME in
     # Font awesome is needed for the alertmanager ui.
     pi prometheus-alertmanager prometheus fonts-font-awesome
     /c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus
+    # make it available for other machines
+    rsync -a /usr/local/bin/amtool /a/opt/bin
     web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
 <Location "/">
 AuthType Basic
@@ -2168,6 +2186,10 @@ case $HOSTNAME in
     sudo usermod -a -G bitcoin iank
     # todo: make bitcoin have a stable uid/gid
     if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
+      mkdir -p /var/lib/bitcoind
+      chown bitcoin:bitcoin /var/lib/bitcoind
+      # 710 comes from the upstream bitcoin unit file
+      chmod 710 /var/lib/bitcoind
       s lnf /q/wallets /var/lib/bitcoind
       sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
     fi
@@ -2181,7 +2203,7 @@ esac
 case $HOSTNAME in
   kw|x3)
     sd /etc/cups/client.conf <<'EOF'
-ServerName printserver0.office.fsf.org
+ServerName printserver1.office.fsf.org
 EOF
     ;;
 esac