iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots o fixes, beets, shellcheck stuff
[distro-setup]
/
distro-end
diff --git
a/distro-end
b/distro-end
index 5092ce74aec71089abbae1b4f52875c00fecd17b..2124a7c968f81d283cd2d7bf7afe35d7eec00969 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.
@@
-1813,21
+1815,27
@@
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
# notes about barrier
# run barrier, do the gui config,
# notes about barrier
# run barrier, do the gui config,
@@
-1947,10
+1955,18
@@
esac
### begin prometheus ###
### begin prometheus ###
+
+# 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
+
+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,13
+2003,15
@@
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