X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=721b2c1a19de981337f4291b8a6264dde88cbf70;hb=9a0f77b0495e6f2643d5646c54b4c99cf3118c67;hp=a9ab55a1e2ce3fd602960cdf9f543598ee9bcf3f;hpb=279890b457806c91686cf04e3426b8c951c244eb;p=distro-setup
diff --git a/distro-end b/distro-end
index a9ab55a..721b2c1 100755
--- 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
@@ -90,7 +90,6 @@ EOF
########### begin section including vps ################
pi ${p2[@]}
-
conflink
sudo rm -fv
@@ -124,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
-#
-# AllowOverride None
-# AuthType basic
-# AuthName "Authentication Required"
-# # setup one time, with root:www-data, 640
-# AuthUserFile "/etc/prometheus-htpasswd"
-# Require valid-user
-#
-# EOF
-# fi
-
-
-
-
pi debootstrap
######### begin universal pinned packages ######
case $(debian-codename) in
@@ -570,15 +536,27 @@ esac
##### begin automatic upgrades (after checkrestart has been installed) ####
# if apt-config-auto-update is installed,
# it also has similar config, in a file 10something,
-# but i think his overrides it since its higher number.
+# but i think this overrides it since its higher number.
# This file was part of the automatic-updates package,
-# and it has a configu option to not get new package lists,
+# and it has a config option to not get new package lists,
# which seems pretty stupid to me, you cant actually upgrade
# anything if you dont have the new package list.
sd /etc/apt/apt.conf.d/20auto-upgrades <<'EOF'
+# note: man apt.conf says
+# /usr/share/doc/apt/examples/configure-index.gz is a configuration file showing
+# example values for all possible options.
+# but that is a incorrect.
+# Periodic and other options are only documented in
+# /usr/lib/apt/apt.systemd.daily
+# That filename can be found through poking around in apt daily cronjob.
APT::Periodic::Update-Package-Lists "1";
APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::AutocleanInterval "7";
+# 0 means disabled. I used to set this to 7, however, trisquel doesn't
+# have an archive of old package versions, so I want to
+# keep around old versions so I can easily downgrade.
+APT::Periodic::AutocleanInterval "0";
+# daily expire old files /var/cache/apt if it gets above this MB
+APT::Periodic::MaxSize "50000";
APT::Periodic::Unattended-Upgrade "1";
EOF
@@ -620,8 +598,7 @@ case $HOSTNAME in
dnsb8
fi
- pi prometheus-node-exporter
- /a/bin/buildscripts/prom-node-exporter -l
+ 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'
@@ -652,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
@@ -673,34 +666,18 @@ EOF
client-to-client
EOF
- sd /etc/openvpn/client-config-hole/kd <<'EOF'
-ifconfig-push 10.5.5.2 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/tp <<'EOF'
-ifconfig-push 10.5.5.3 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/frodo <<'EOF'
-ifconfig-push 10.5.5.5 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/x2 <<'EOF'
-ifconfig-push 10.5.5.7 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/x3 <<'EOF'
-ifconfig-push 10.5.5.8 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/kw <<'EOF'
-ifconfig-push 10.5.5.9 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/sy <<'EOF'
-ifconfig-push 10.5.5.12 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/bo <<'EOF'
-ifconfig-push 10.5.5.13 255.255.255.0
-EOF
- sd /etc/openvpn/client-config-hole/onep9 <<'EOF'
-ifconfig-push 10.5.5.14 255.255.255.0
+
+ 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 </dev/null && \
! systemctl is-active transmission-daemon; then
tmp=$(mktemp)
@@ -1603,6 +1606,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.
@@ -1644,7 +1650,7 @@ EOF
"profiles" : [
{
"profile-name" : "Default",
- "hostname" : "10.173.0.2",
+ "hostname" : "10.174.2.2",
"rpc-url-path" : "/transmission/rpc",
"username" : "",
"password" : "$rpc_pass",
@@ -1696,7 +1702,7 @@ sudo gpasswd -a $USER lpadmin # based on ubuntu wiki
m /a/bin/buildscripts/go
# only needed for rg. cargo takes up 11 gigs, filled up the disk on je.
-#m /a/bin/buildscripts/rust
+m /a/bin/buildscripts/rust
m /a/bin/buildscripts/misc
m /a/bin/buildscripts/pithosfly
#m /a/bin/buildscripts/alacritty
@@ -1794,6 +1800,11 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
########### misc stuff
+
+xdg-settings set default-web-browser abrowser.desktop
+# see current with:
+# xdg-settings get default-web-browser
+
# pressing tab after sdf here:
# scp sdfbash: set +o noglob: command not found
# in t11, bash 5.1.16. this fixes it.
@@ -1957,25 +1968,20 @@ sgo dynamicipupdate
if grep -xFq $HOSTNAME /a/bin/ds/machine_specific/btrbk.hosts; then
sgo btrbk.timer
fi
-# note: to see when it was last run,
+
+# note: to see when a timer was last run,
# ser list-timers
-case $HOSTNAME in
- kd)
- sgo btrbkrust.timer
- ;;
-esac
### begin prometheus ###
-
-
-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
+ # 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'
AuthType Basic
@@ -2011,7 +2017,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 127.0.0.1
for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
sysd-prom-fail-install $ser
@@ -2019,7 +2025,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 +2080,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 +2131,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,20 +2174,23 @@ 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/*
- sgo bitcoind
+ sy|kd)
+ 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
- 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
+ # todo: make bitcoin have a stable uid/gid
+ 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
;;
@@ -2186,10 +2198,34 @@ 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'
-ServerName printserver0.office.fsf.org
+ServerName printserver1.office.fsf.org
EOF
;;
esac