From 8028371a1ca896cb6dfe4d0293f6450d323b2add Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Tue, 19 Nov 2024 06:24:59 +0000 Subject: [PATCH] Fix failure error message and create (empty) wg0.conf if it doesn't exist --- overlay/usr/lib/inithooks/bin/wireguard.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/overlay/usr/lib/inithooks/bin/wireguard.py b/overlay/usr/lib/inithooks/bin/wireguard.py index 5dc41ff..af72456 100755 --- a/overlay/usr/lib/inithooks/bin/wireguard.py +++ b/overlay/usr/lib/inithooks/bin/wireguard.py @@ -89,14 +89,19 @@ def main(): inithooks_cache.write('APP_DOMAIN', domain) + # setup will fail if wg conf doesn't exist; it should but just in case... + wg0_conf = "/etc/wireguard/wg0.conf" + if not os.path.exists(wg0_conf): + open(wg0_conf, 'w').close() + cmd = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'wireguard-server-init.sh') proc = subprocess.run([cmd, virtual_subnet, domain], capture_output=True, text=True) if proc.returncode != 0: - fatal(f"command {' '.join(cmd)} failed:" - f"\n{sys.stderr}") + fatal(f"command {cmd} failed:" + f"\n{proc.stderr}") if __name__ == '__main__':