X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=b7a164e27a8323118e830f16a5b311da1a9b76c8;hb=61ed433181c33cd554c70db0d632946a0939a997;hp=cdfd64dc112ec2e30b33e1d79a52c468e767dec4;hpb=b1f87cc8bd1764dac5ba39cf75e513cfc5493ca7;p=distro-setup diff --git a/distro-end b/distro-end index cdfd64d..b7a164e 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 @@ -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 -# -# 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 @@ -569,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 @@ -619,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' @@ -650,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 @@ -1277,6 +1272,24 @@ fi ####### begin misc packages ########### +# old location, 2023. +sudo rm -fv /etc/systemd/system/profanity.service +case $HOSTNAME in + kd) + ln -sfT /d/p/profanity ~/.local/share/profanity + ln -sfT /d/p/profanity-config ~/.config/profanity + source /a/bin/bash_unpublished/source-state + if [[ $HOSTNAME == "$HOST2" || ! -e /p/profanity-here ]]; then + systemctl --user --now enable profanity + fi + ;; + *) + + ln -sfT /p/profanity ~/.local/share/profanity + ln -sfT /p/profanity-config ~/.config/profanity + ;; +esac + # template case $codename in flidas) @@ -1787,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. @@ -2164,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 ;;