X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=16fc7a5b0afbcfe6e46291c24ce4edbf3a1e744d;hb=HEAD;hp=19cdaba738bda94a9c6b02808c0d25b80094057c;hpb=c536de80536e71af6e69eb1a57575ca1a41101c6;p=distro-setup

diff --git a/distro-end b/distro-end
index 19cdaba..d99e6a1 100755
--- a/distro-end
+++ b/distro-end
@@ -18,8 +18,8 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# shellcheck source=/a/bin/ds/.bashrc
-export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi
+export LC_USEBASHRC=t
+source /a/bin/ds/.bashrc
 
 ### setup
 source /a/bin/bash-bear-trap/bash-bear
@@ -191,16 +191,17 @@ EOF
     done
     if $doupdate; then
       tmpdir=$(mktemp -d)
-      cd $tmpdir
-      # cant apt get the keyring without doing an update, can't update
-      # without the keyring, this is a stupid chicken and egg problem
-      # that apt should have some feature to solve, but doesn't as far
-      # as I know.
-      f=debian-archive-keyring_2023.3+deb12u1_all.deb
-      wget http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/$f
-      dpkg -i $f
+      (
+        cd $tmpdir
+        # cant apt get the keyring without doing an update, can't update
+        # without the keyring, this is a stupid chicken and egg problem
+        # that apt should have some feature to solve, but doesn't as far
+        # as I know.
+        f=debian-archive-keyring_2023.3+deb12u1_all.deb
+        wget http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/$f
+        sudo dpkg -i $f
+      )
       p update
-      cd -
       rm -rf $tmpdir
     fi
 
@@ -522,18 +523,7 @@ EOF
 client-to-client
 EOF
 
-
-    ngset
-    files=(/etc/openvpn/client-config-hole/*)
-    if (( ${#files[@]} >= 1 )); then
-      rm -f ${files[@]}
-    fi
-    ngreset
-    for host in ${!vpn_ips[@]}; do
-      sd /etc/openvpn/client-config-hole/$host <<EOF
-ifconfig-push 10.5.5.${vpn_ips[$host]} 255.255.255.0
-EOF
-    done
+    # note client-config files are setup in brc2 update-host-info
 
 
     # for adding cert to system with /p
@@ -1845,7 +1835,7 @@ case $HOSTNAME in
     /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'
+    web-conf -p 9091 -f 9090 - apache2 b8.nz <<'EOF'
 <Location "/">
 AuthType Basic
 AuthName "basic_auth"
@@ -1856,7 +1846,7 @@ Require valid-user
 </Location>
 EOF
 
-    web-conf -p 9094 -f 9093 - apache2 i.b8.nz <<'EOF'
+    web-conf -p 9094 -f 9093 - apache2 b8.nz <<'EOF'
 <Location "/">
 AuthType Basic
 AuthName "basic_auth"
@@ -1910,7 +1900,7 @@ case $HOSTNAME in
       wgip=$(command sudo sed -rn 's,^ *Address *= *([^/]+).*,\1,p' /etc/wireguard/wghole.conf)
       # old filename. remove once all hosts are updated.
       s rm -fv /etc/apache2/sites-enabled/${HOSTNAME}wg.b8.nz.conf
-      web-conf -i -a $wgip -p 9101 -f 9100 - apache2 ${HOSTNAME}wg.b8.nz <<'EOF'
+      s bash -x web-conf -i -a $wgip -p 9101 -f 9100 - apache2 ${HOSTNAME}wg.b8.nz <<'EOF'
 <Location "/">
 AuthType Basic
 AuthName "basic_auth"
@@ -1946,8 +1936,8 @@ esac
 ### begin bitcoin ###
 
 case $HOSTNAME in
-  sy|kd)
-    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-26.0/bin/*
+  sy|kd|so)
+    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-27.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
@@ -2026,6 +2016,7 @@ curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo
 
 ### end gh ####
 
+
 # remove trisquel banner. it is cool but takes up too much space.
 sudo rm -f /etc/update-motd.d/01-banner