X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=f2eef439a8dc74c97e3e3f99aaa4be6754e98f7a;hb=523b7ff889aaafdcd997d84b2a06744993018e89;hp=6efe7bf347e92816a728bcde8520d804867380bc;hpb=9c77c557e60d21caceeef1e78e35b35ed968fca9;p=distro-setup diff --git a/distro-end b/distro-end index 6efe7bf..f2eef43 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 @@ -569,15 +569,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 @@ -619,8 +631,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 127.0.0.1 # ex for exporter web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF' @@ -651,6 +662,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 @@ -672,34 +699,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) @@ -1593,6 +1639,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. @@ -1634,7 +1683,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", @@ -1685,6 +1734,7 @@ sudo gpasswd -a $USER lpadmin # based on ubuntu wiki # general known for debian/ubuntu, not for fedora 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/misc m /a/bin/buildscripts/pithosfly @@ -1783,6 +1833,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. @@ -1791,7 +1846,6 @@ sudo sed -ri 's/([[:space:]]*)(\$reset)$/\1set +o noglob #$reset/' /usr/share/ba rm -fv /home/iank/.mpv/watch_later rm -rf /home/iank/.mpv - if [[ ! -e ~/.local/bin/pip ]]; then tmp=$(mktemp) wget -O$tmp https://bootstrap.pypa.io/get-pip.py @@ -1799,6 +1853,47 @@ 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. @@ -1906,22 +2001,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 ### 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 + # 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 @@ -1957,16 +2050,25 @@ EOF ser restart prometheus-alertmanager fi + 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 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 # todo, for limiting node exporter http, # either use iptables or, in @@ -2011,9 +2113,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: @@ -2059,7 +2164,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 @@ -2102,23 +2207,42 @@ 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/* + 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, link in wallet. see + # 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 + # note, there exists # /a/bin/ds/disabled/bitcoin ;; esac ### end bitcoin +case $HOSTNAME in + kw|x3) + sd /etc/cups/client.conf <<'EOF' +ServerName printserver1.office.fsf.org +EOF + ;; +esac + end_msg <<'EOF' In mate settings settings, change scrolling to two-finger,