X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=98a28bd9b1bc171118a599c64ffd669d74908127;hb=5abdcfce00c6ff61bf3856f7b5101915dc096107;hp=6e04cc9c4c185a75549622d0d5fffa4f8945e9ee;hpb=ad09c51104f62d1da1782387025b44327a081872;p=distro-setup diff --git a/distro-end b/distro-end index 6e04cc9..98a28bd 100755 --- a/distro-end +++ b/distro-end @@ -509,7 +509,7 @@ esac case $codename_compat in jammy) - s systemctl enable ssh-agent-iank + s systemctl enable --now ssh-agent-iank ;; esac @@ -609,23 +609,6 @@ sudo rm -f /etc/cron.d/unattended-upgrade-reboot /usr/local/bin/zelous-unattende # Pin-Priority: 500 # EOF -if [[ -e /etc/wireguard/wghole.conf ]]; then - reload=false - if [[ ! -e /etc/systemd/system/wg-quick@wghole.service.d/override.conf ]]; then - reload=true - fi - sudo mkdir -p /etc/systemd/system/wg-quick@wghole.service.d - sd /etc/systemd/system/wg-quick@wghole.service.d/override.conf <<'EOF' -[Unit] -StartLimitIntervalSec=0 - -[Service] -Restart=on-failure -RestartSec=20 -EOF - if $reload; then ser daemon-reload; fi - sgo wg-quick@wghole -fi ###### begin website setup case $HOSTNAME in @@ -913,7 +896,7 @@ esac ### system76 things ### case $HOSTNAME in - sy|bo) + bo) # sy| sy doesnt seem to really need this. # note, i stored the initial popos packages at /a/bin/data/popos-pkgs if [[ ! -e /etc/apt/sources.list.d/system76.list ]]; then # https://blog.zackad.dev/en/2017/08/17/add-ppa-simple-way.html @@ -946,6 +929,7 @@ EOF fi ;; esac +### end system76 things ### case $distro in trisquel|ubuntu) @@ -1014,7 +998,7 @@ EOF ;; jammy) # not yet bothering with mate - pi lightdm-gtk-greeter + pi lightdm-gtk-greeter lightdm ;; esac @@ -1831,6 +1815,10 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \ ########### misc stuff +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 ||: @@ -2004,6 +1992,7 @@ case $HOSTNAME in # either use iptables or, in # /etc/default/prometheus-node-exporter # listen on the wireguard interface + *) wgip=$(command sudo sed -rn 's,^ *Address *= *([^/]+).*,\1,p' /etc/wireguard/wghole.conf) # old filename. remove once all hosts are updated.