fix syntax error

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 6e7f92ace27b4503309e4e456bc16d60e5ef0d5a..721b2c1a19de981337f4291b8a6264dde88cbf70 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -6,7 +6,7 @@
 export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi
 
 ### setup
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file
 
 if [[ $EUID == 0 ]]; then
@@ -123,39 +123,6 @@ esac
 
 
 
-
-# dogcam setup. not using atm
-# case $HOSTNAME in
-#   lj|li)
-#     /a/bin/webcam/install-server
-#     ;;
-#   kw)
-#     /a/bin/webcam/install-client
-#     ;;
-# esac
-
-
-## not actually using prometheus just yet
-# # office is not exposed to internet yet
-# if [[ $HOSTNAME != kw ]]; then
-#   ## prometheus node exporter setup
-#   web-conf -f 9100 -p 9101 apache2 $(hostname -f) <<'EOF'
-# #https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
-# # https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication
-# <Location />
-#    AllowOverride None
-#    AuthType basic
-#    AuthName "Authentication Required"
-#    # setup one time, with root:www-data, 640
-#    AuthUserFile "/etc/prometheus-htpasswd"
-#    Require valid-user
-# </Location>
-# EOF
-# fi
-
-
-
-
 pi debootstrap
 ######### begin universal pinned packages ######
 case $(debian-codename) in
@@ -631,7 +598,7 @@ case $HOSTNAME in
       dnsb8
     fi
 
-    s /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l 127.0.0.1
+    sudo /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l 127.0.0.1
 
     # ex for exporter
     web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF'
@@ -662,6 +629,22 @@ EOF
     ;;
   li)
 
+    p build-dep eggdrop
+    if [[ ! -L ~/eggdrop/eggdrop ]]; then
+      cd
+      git clone https://github.com/eggheads/eggdrop eggdrop-src
+      cd eggdrop-src
+      ./configure
+      make config
+      make
+      make install
+    fi
+
+    # dunno if this is really needed. it was part of the documented eggdrop systemd install script
+    sudo loginctl enable-linger
+    systemctl --user enable fsysbot
+    systemctl --user start fsysbot
+
     m /a/h/setup.sh iankelling.org
 
     # start mumble only when im going to use it, since i dont use it much
@@ -2199,19 +2182,15 @@ esac
 
 case $HOSTNAME in
   sy|kd)
-    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.0.1/bin/*
-    sgo bitcoind
+    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-26.0/bin/*
+    # Note: i leave it to system-status to start and stop bitcoin.
     # 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
-      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
+    sudo mkdir -p /var/lib/bitcoind
+    sudo chown bitcoin:bitcoin /var/lib/bitcoind
+    # 710 comes from the upstream bitcoin unit file
+    sudo chmod 710 /var/lib/bitcoind
     # note, there exists
     # /a/bin/ds/disabled/bitcoin
     ;;
@@ -2219,6 +2198,30 @@ esac
 
 ### end bitcoin
 
+### begin gh ####
+
+# from https://raw.githubusercontent.com/cli/cli/trunk/docs/install_linux.md
+# One time setup afterwards:
+# gh auth login
+#
+# When it gets to the page where it asks to authorize github, the button
+# is grayed out. You can just open browser dev tools, inspect the
+# button, remove disabled="", then click it and it works.
+#
+# Auth token gets saved into /p/c/subdir_files/.local/share/keyrings/
+#
+# initial config goes to /home/iank/.config/gh
+curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+  && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+  && sudo apt update \
+  && sudo apt install gh -y
+
+### end gh ####
+
+# remove trisquel banner. it is cool but takes up too much space.
+sudo rm -f /etc/update-motd.d/01-banner
+
 case $HOSTNAME in
   kw|x3)
     sd /etc/cups/client.conf <<'EOF'