From 3b7e14755c7b485261d715dccd438932c3c78f58 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Mon, 25 Dec 2023 10:19:34 +0100
Subject: [PATCH] bundles/wireguard: clean up leftovers

---
 bundles/wireguard/files/pppd-ip-up      | 10 ------
 bundles/wireguard/files/wg_health_check | 46 -------------------------
 bundles/wireguard/items.py              |  7 ----
 3 files changed, 63 deletions(-)
 delete mode 100644 bundles/wireguard/files/pppd-ip-up
 delete mode 100644 bundles/wireguard/files/wg_health_check

diff --git a/bundles/wireguard/files/pppd-ip-up b/bundles/wireguard/files/pppd-ip-up
deleted file mode 100644
index 5e5d200..0000000
--- a/bundles/wireguard/files/pppd-ip-up
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# We need to send some traffic over the wireguard tunnel to make sure
-# it gets connected. Easiest way is to simply send some pings to the
-# other side.
-
-% for peer, config in sorted(node.metadata.get('wireguard/peers', {}).items()):
-# refresh connection to ${peer}
-/usr/bin/ping -c 4 ${config['their_ip']}
-% endfor
diff --git a/bundles/wireguard/files/wg_health_check b/bundles/wireguard/files/wg_health_check
deleted file mode 100644
index 976e112..0000000
--- a/bundles/wireguard/files/wg_health_check
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-if [[ -e "/var/lib/bundlewrap/hard-${node.name}/info" ]]
-then
-    # make sure we're not restarting during bw apply
-    echo "bw apply running"
-    exit 0
-fi
-
-now="$(date +%s)"
-
-everything_up=1
-
-% for peer, ip in sorted(peers.items()):
-# ${peer}
-if ! /usr/bin/ping -c 4 ${ip} >/dev/null 2>&1
-then
-    echo "${peer} was not reachable!"
-    everything_up=0
-fi
-
-% endfor
-if [[ "$everything_up" -eq 1 ]]
-then
-    echo "Everything is up as expected"
-    echo "$now" > /var/tmp/wg_all_reached
-    exit 0
-fi
-
-five_min_ago="$(expr $now - 300)"
-last_reached="$(cat /var/tmp/wg_all_reached)"
-
-if [[ "$last_reached" -lt "$five_min_ago" ]]
-then
-    echo "RESTART"
-
-    systemctl restart systemd-networkd
-
-    # only restart once an hour
-    echo "$(expr $now + 3300)" > /var/tmp/wg_all_reached
-elif [[ "$last_reached" -gt "$now" ]]
-then
-    echo "Something's broken, but we have recently restarted"
-else
-    echo "Something's broken, but still in grace time"
-fi
diff --git a/bundles/wireguard/items.py b/bundles/wireguard/items.py
index 0a270d1..4298dde 100644
--- a/bundles/wireguard/items.py
+++ b/bundles/wireguard/items.py
@@ -34,10 +34,3 @@ for peer, config in sorted(node.metadata.get('wireguard/peers', {}).items()):
             'svc_systemd:systemd-networkd:restart',
         },
     }
-
-if node.has_bundle('pppd'):
-    files['/etc/ppp/ip-up.d/reconnect-wireguard'] = {
-        'source': 'pppd-ip-up',
-        'content_type': 'mako',
-        'mode': '0755',
-    }