iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly fixes, some improvements
[distro-setup]
/
distro-end
diff --git
a/distro-end
b/distro-end
index 5092ce74aec71089abbae1b4f52875c00fecd17b..bcfe627e94d87cd62d704ddeba9111cdb5c19488 100755
(executable)
--- a/
distro-end
+++ b/
distro-end
@@
-346,6
+346,7
@@
EOF
# for ziva
#p install --no-install-recommends minetest/buster libleveldb1d/buster libncursesw6/buster libtinfo6/buster
doupdate=false
# 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)
for n in bullseye; do
f=/etc/apt/sources.list.d/$n.list
t=$(mktemp)
@@
-421,7
+422,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
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
p update
fi
@@
-450,7
+451,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
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
p update
fi
@@
-495,7
+496,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
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
p update
fi
@@
-1063,6
+1064,7
@@
esac
# way to install suggests even if the main package is already
# installed. reinstall doesn't work, uninstalling can cause removing
# dependent packages.
# 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.
pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $($src/distro-pkgs)
# schroot service will restart schroot sessions after reboot.
@@
-1685,7
+1687,8
@@
sudo gpasswd -a $USER lpadmin # based on ubuntu wiki
# general known for debian/ubuntu, not for fedora
m /a/bin/buildscripts/go
# 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
m /a/bin/buildscripts/misc
m /a/bin/buildscripts/pithosfly
#m /a/bin/buildscripts/alacritty
@@
-1813,20
+1816,30
@@
fi
# "equivs-control <name>, edit the file produced to provide the right
# dependency and have a nice name, then run equivs-build <name> and
# finally dpkg -i the resulting .deb file"
# "equivs-control <name>, edit the file produced to provide the right
# dependency and have a nice name, then run equivs-build <name> and
# finally dpkg -i the resulting .deb file"
-
-mkct
-# edited from output of equivs-control tox
-cat >tox <<'EOF'
+# 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
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
+ 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
# notes about barrier
@@
-1947,10
+1960,13
@@
esac
### begin prometheus ###
### begin prometheus ###
+
+
+pi prometheus-node-exporter-collectors
case $HOSTNAME in
kd)
# Font awesome is needed for the alertmanager ui.
case $HOSTNAME in
kd)
# Font awesome is needed for the alertmanager ui.
- pi prometheus-alertmanager prometheus
prometheus-node-exporter
fonts-font-awesome
+ pi prometheus-alertmanager prometheus fonts-font-awesome
/a/bin/buildscripts/prometheus
web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
<Location "/">
/a/bin/buildscripts/prometheus
web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
<Location "/">
@@
-1987,16
+2003,25
@@
EOF
ser restart prometheus-alertmanager
fi
ser restart prometheus-alertmanager
fi
+ /a/bin/buildscripts/prom-node-exporter -l
+
for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
sysd-prom-fail-install $ser
done
;;
*)
for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
sysd-prom-fail-install $ser
done
;;
*)
-
pi prometheus
-node-exporter
+
/a/bin/buildscripts/prom
-node-exporter
;;
esac
;;
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
case $HOSTNAME in
# todo, for limiting node exporter http,
# either use iptables or, in
@@
-2142,7
+2167,10
@@
case $HOSTNAME in
sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
sgo bitcoind
sudo usermod -a -G bitcoin iank
sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
sgo bitcoind
sudo usermod -a -G bitcoin iank
- sudo ln -s /q/wallets /var/lib/bitcoind
+ 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
# note, there exists
# /a/bin/ds/disabled/bitcoin
;;
# note, there exists
# /a/bin/ds/disabled/bitcoin
;;
@@
-2150,6
+2178,14
@@
esac
### end bitcoin
### 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,
end_msg <<'EOF'
In mate settings settings, change scrolling to two-finger,