X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=4452a3be547a215c162b40b032596847a3ea679b;hb=dc34d23c63cd83a7cc7a79525445aad3293c7241;hp=e07ab789b46583fdccb294eba1b7f679df651464;hpb=fa264ab2ec907b4ebc8d7dd0f8b239b0d0202362;p=distro-setup diff --git a/distro-end b/distro-end index e07ab78..4452a3b 100755 --- a/distro-end +++ b/distro-end @@ -90,7 +90,6 @@ EOF ########### begin section including vps ################ pi ${p2[@]} - conflink sudo rm -fv @@ -346,6 +345,7 @@ EOF # for ziva #p install --no-install-recommends minetest/buster libleveldb1d/buster libncursesw6/buster libtinfo6/buster doupdate=false + # shellcheck disable=SC2043 # in case we want more than 1 in the loop later. for n in bullseye; do f=/etc/apt/sources.list.d/$n.list t=$(mktemp) @@ -421,7 +421,7 @@ deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main universe deb http://us.archive.ubuntu.com/ubuntu/ focal-security main universe EOF if ! diff -q $t $f; then - sudo dd if=$t of=$f 2>/dev/null + sudo dd if=$t of=$f status=none p update fi @@ -450,7 +450,7 @@ deb http://mirror.fsf.org/trisquel/ nabia-backports main deb-src http://mirror.fsf.org/trisquel/ nabia-backports main EOF if ! diff -q $t $f; then - sudo dd if=$t of=$f 2>/dev/null + sudo dd if=$t of=$f status=none p update fi @@ -495,7 +495,7 @@ deb http://mirror.fsf.org/trisquel/ aramo-backports main deb-src http://mirror.fsf.org/trisquel/ aramo-backports main EOF if ! diff -q $t $f; then - sudo dd if=$t of=$f 2>/dev/null + sudo dd if=$t of=$f status=none p update fi @@ -619,8 +619,7 @@ case $HOSTNAME in dnsb8 fi - pi prometheus-node-exporter - /a/bin/buildscripts/prom-node-exporter -l + s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter -l # ex for exporter web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF' @@ -672,53 +671,52 @@ EOF client-to-client EOF - # sullivan d8 - sd /etc/openvpn/client-config-hole/sd8 <<'EOF' -ifconfig-push 10.5.5.41 255.255.255.0 -EOF - # hsieh d8 - sd /etc/openvpn/client-config-hole/hd8 <<'EOF' -ifconfig-push 10.5.5.42 255.255.255.0 -EOF - - sd /etc/openvpn/client-config-hole/onep9 <<'EOF' -ifconfig-push 10.5.5.14 255.255.255.0 + 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/bo <<'EOF' -ifconfig-push 10.5.5.13 255.255.255.0 + 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/sy <<'EOF' -ifconfig-push 10.5.5.12 255.255.255.0 + 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/kw <<'EOF' -ifconfig-push 10.5.5.9 255.255.255.0 + 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/x2 <<'EOF' -ifconfig-push 10.5.5.7 255.255.255.0 -EOF - sd /etc/openvpn/client-config-hole/wclient <<'EOF' -ifconfig-push 10.5.5.6 255.255.255.0 + 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/frodo <<'EOF' -ifconfig-push 10.5.5.5 255.255.255.0 + 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/amy <<'EOF' -ifconfig-push 10.5.5.3 255.255.255.0 + 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/kd <<'EOF' -ifconfig-push 10.5.5.2 255.255.255.0 + sd /etc/openvpn/client-config-hole/onep9 <<'EOF' +ifconfig-push 10.5.5.14 255.255.255.0 EOF + # todo: add x8? + - # for adding to current system: - #vpn-mk-client-cert -s "" -n hole 72.14.176.105 - # adding to remove system 107, - #vpn-mk-client-cert -s "" -n hole -c 10.2.0.107 -b hd8 iankelling.org + # for adding cert to system with /p + # + # host=frodo + #mkc /p/c/machine_specific/$host/filesystem/etc/openvpn/client + #vpn-mk-client-cert -b $host -n hole -r iankelling.org + #s chown -R iank:iank . # - # for wireguard hole vpn + # example of adding to remote system 107, + # vpn-mk-client-cert -n hole -c 10.2.0.107 -b hd8 iankelling.org + # + # for wireguard hole vpn, use function: # wghole + # eg: + # wghole bo 28 + # if it is going to want to connect to transmission-daemon on ok + # wghole bo 28 10.173.0.2/32 # requested from linode via a support ticket. # https://www.linode.com/docs/networking/an-overview-of-ipv6-on-linode/ @@ -887,6 +885,16 @@ EOF end ;; esac + +case $HOSTNAME in + bk) + pi icecast2 + # todo, save the config + /etc/cron.daily/stream-cert + web-conf -c /etc/cert-live.fsf.org -p 443 -f 8000 apache2 live.fsf.org + ;; +esac + ###### end website setup ########### end section including li/lj ############### @@ -1068,8 +1076,25 @@ esac # way to install suggests even if the main package is already # installed. reinstall doesn't work, uninstalling can cause removing # dependent packages. +# shellcheck disable=SC2046 # word splitting is intended pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $($src/distro-pkgs) +# schroot service will restart schroot sessions after reboot. +# I dont want that. +pi-nostart schroot + +# fix systemd unit failure. i dont know of any actual impact +# other than systemd showing in degraded state. So, we dont bother +# fixing the current state, let it fix on the next reboot. +# https://gitlab.com/cjwatson/binfmt-support/-/commit/54f0e1af8a +tmp=$(systemctl cat binfmt-support.service | grep ^After=) +if [[ $tmp != *systemd-binfmt.service* ]]; then + s u /etc/systemd/system/binfmt-support.service.d/override.conf </dev/null; then # note, see bashrc for more documentation. @@ -1218,10 +1204,6 @@ if [[ -e /p/c/machine_specific/$HOSTNAME/filesystem/etc/openvpn/client/hole.crt sgo openvpn-client@hole fi -if [[ $HOSTNAME == frodo ]]; then - vpn-mk-client-cert -b frodo -n hole iankelling.org -fi - ############# begin syncthing setup ########### case $HOSTNAME in kd|frodo) @@ -1516,7 +1498,7 @@ case $HOSTNAME in ;; esac -mkdir -p $tdir +sudo mkdir -p $tdir # adapted from /var/lib/dpkg/info/transmission-daemon.postinst # 450 seems likely to be unused. we need to specify one or else @@ -1566,7 +1548,7 @@ ser stop transmission-daemon f=$tdir/transmission-daemon for d in $tdir/partial-torrents $tdir/torrents $f; do if [[ ! -d $d ]]; then - mkdir $d + sudo mkdir -p $d fi sudo chown -R debian-transmission:user2 $d done @@ -1625,6 +1607,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. @@ -1717,7 +1702,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 @@ -1815,15 +1801,14 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \ ########### misc stuff +# pressing tab after sdf here: +# scp sdfbash: set +o noglob: command not found +# in t11, bash 5.1.16. this fixes it. +sudo sed -ri 's/([[:space:]]*)(\$reset)$/\1set +o noglob #$reset/' /usr/share/bash-completion/bash_completion + rm -fv /home/iank/.mpv/watch_later rm -rf /home/iank/.mpv - -if [[ $HOSTNAME != frodo ]]; then - # remove. i moved this into dns - echo | s cedit hole /etc/hosts ||: -fi - if [[ ! -e ~/.local/bin/pip ]]; then tmp=$(mktemp) wget -O$tmp https://bootstrap.pypa.io/get-pip.py @@ -1831,6 +1816,61 @@ if [[ ! -e ~/.local/bin/pip ]]; then hash -r fi +## begin beets +# soo, apt install beets fails due to wanting a pip package, +# we find out why it wants this through +# apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances beets | less +# python-mediafile requires tox, which requires virtualenv, which requires pip. +# but, python-mediafile doesn't really require tox, it is specified in +# ./usr/lib/python3/dist-packages/mediafile-0.9.0.dist-info/METADATA +# as being required only for testing, but the debian package +# included it anyways, due to a mistake or bad tooling or something. +# I don't plan to use tox, so, according to https://serverfault.com/a/251091, +# we can create and install a dummy package by: +# +# "equivs-control , edit the file produced to provide the right +# dependency and have a nice name, then run equivs-build and +# finally dpkg -i the resulting .deb file" +# as of 2023-02, the tox dependency was removed in debian unstable, so +# this hack will probably go away in t12. + +if pcheck beets; then + tmpdir="$(mktemp -d)" + cd "$tmpdir" + # edited from output of equivs-control tox + cat >tox <<'EOF' +Section: python +Priority: optional +Standards-Version: 3.9.2 +Package: tox +Description: tox-dummy +EOF + equivs-build tox + sudo dpkg -i tox_1.0_all.deb + rm -rf ./tox* + pi beets python3-discogs-client + cd + 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. +# save the server config +# $HOME/.local/share/barrier/.barrier.conf +# per the man page. +# +# ssl errors, resolved via advice here: https://github.com/debauchee/barrier/issues/231 +# BARRIER_SSL_PATH=~/.local/share/barrier/SSL/ +# mkdir -p "${BARRIER_SSL_PATH}" +# openssl req -x509 -nodes -days 365 -subj /CN=Barrier -newkey rsa:4096 -keyout ${BARRIER_SSL_PATH}/Barrier.pem -out ${BARRIER_SSL_PATH}/Barrier.pem +# ran on both machines. +# When pressing start in the gui, the cli options used are printed to the console, +# they are useful. So on server, just run barriers, client run barrierc SERVER_IP ### begin timetrap setup if mountpoint /p &>/dev/null; then @@ -1893,13 +1933,13 @@ sudo fc-cache pi desktop-file-utils m /a/bin/distro-setup/mymimes - -# stop autopoping windows when i plug in an android phone. -# dbus-launch makes this work within an ssh connection, otherwise you get this message, -# with still 0 exit code. -# dconf-WARNING **: failed to commit changes to dconf: Cannot autolaunch D-Bus without X11 $DISPLAY -m dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false - +if type -p dbus-launch >/dev/null; then + # stop autopoping windows when i plug in an android phone. + # dbus-launch makes this work within an ssh connection, otherwise you get this message, + # with still 0 exit code. + # dconf-WARNING **: failed to commit changes to dconf: Cannot autolaunch D-Bus without X11 $DISPLAY + m dbus-launch gsettings set org.gnome.desktop.media-handling automount-open false +fi # on grub upgrade, we get prompts unless we do this devs=() @@ -1924,6 +1964,10 @@ sgo dynamicipupdate if grep -xFq $HOSTNAME /a/bin/ds/machine_specific/btrbk.hosts; then sgo btrbk.timer fi +if [[ $HOSTNAME == kd ]]; then + sgo btrbk-spread.timer +fi + # note: to see when it was last run, # ser list-timers @@ -1935,11 +1979,13 @@ esac ### begin prometheus ### + + case $HOSTNAME in kd) # Font awesome is needed for the alertmanager ui. - pi prometheus-alertmanager prometheus prometheus-node-exporter fonts-font-awesome - /a/bin/buildscripts/prometheus + pi prometheus-alertmanager prometheus fonts-font-awesome + /c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF' AuthType Basic @@ -1975,19 +2021,26 @@ EOF ser restart prometheus-alertmanager fi + s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter -l + for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do sysd-prom-fail-install $ser done ;; *) - pi prometheus-node-exporter + s /c/roles/prom-export/files/simple/usr/local/bin/fsf-install-node-exporter ;; 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 - # frodo needs upgrade first. - frodo) : ;; # todo, for limiting node exporter http, # either use iptables or, in # /etc/default/prometheus-node-exporter @@ -2031,16 +2084,21 @@ esac ### begin nagios ### -pi nagios4 -s rm /etc/apache2/conf-enabled/nagios4-cgi.conf +pi nagios-nrpe-server + +case $HOSTNAME in + kd) + # 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: -# htdigest /etc/nagios4/htdigest.users Nagios4 iank -# now using the same pass as prometheus + # to add a password for admin: + # htdigest /etc/nagios4/htdigest.users Nagios4 iank + # now using the same pass as prometheus -# nagstamon auth settings, set to digest instead of basic. + # nagstamon auth settings, set to digest instead of basic. -web-conf -p 3005 - apache2 i.b8.nz <<'EOF' + web-conf -p 3005 - apache2 i.b8.nz <<'EOF' # adapted from /etc/apache2/conf-enabled/nagios4-cgi.conf ScriptAlias /cgi-bin/nagios4 /usr/lib/cgi-bin/nagios4 @@ -2077,7 +2135,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 @@ -2088,7 +2146,8 @@ Alias /nagios4 /usr/share/nagios4/htdocs Options +ExecCGI EOF - + ;; +esac # when you alter a service through the web, it changes vars in /var/lib/nagios4/status.dat. for example: # notifications_enabled=1 @@ -2096,13 +2155,13 @@ EOF # in the default config, we have these definitions - # 11 define command { - # 2 define contact { - # 1 define contactgroup { - # 9 define host { - # 4 define hostgroup { - # 23 define service { - # 5 define timeperiod { +# 11 define command { +# 2 define contact { +# 1 define contactgroup { +# 9 define host { +# 4 define hostgroup { +# 23 define service { +# 5 define timeperiod { # on klaxon @@ -2119,8 +2178,38 @@ EOF # 6 define timeperiod + + ### end nagios ### +### begin bitcoin ### + +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 + # 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 + s lnf /q/wallets /var/lib/bitcoind + sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets + fi + # note, there exists + # /a/bin/ds/disabled/bitcoin + ;; +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, @@ -2156,7 +2245,7 @@ lnf -T /a/opt ~/src pi tor m /a/bin/buildscripts/tor-browser # one root command needed to install -s ln -sf /a/opt/tor-browser_en-US/Browser/start-tor-browser /usr/local/bin +s ln -sf /a/opt/tor-browser/Browser/start-tor-browser /usr/local/bin # nfs server