X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=09ad1de2ec7b3ea63bb081adda46b25ad19f19c4;hp=6e04cc9c4c185a75549622d0d5fffa4f8945e9ee;hb=602a1874cc11a7d371890cdae4c0dc982267ea89;hpb=8fc333f8c2d69d0792f3742d4f4351e7acb07d9e diff --git a/distro-end b/distro-end index 6e04cc9..09ad1de 100755 --- a/distro-end +++ b/distro-end @@ -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 @@ -2004,6 +1987,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.