From 35e2899b3c97548c754f8fc16b66b5537728d0a7 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@eth0.com.br>
Date: Tue, 27 Jan 2026 16:49:18 -0300
Subject: [PATCH] Clean up abandoned WireGuard configuration files and enhance
 logging

---
 wireguard_tools/views.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/wireguard_tools/views.py b/wireguard_tools/views.py
index fa6cfbe..ee8d955 100644
--- a/wireguard_tools/views.py
+++ b/wireguard_tools/views.py
@@ -1,3 +1,5 @@
+import glob
+import logging
 import os
 import re
 import subprocess
@@ -86,10 +88,26 @@ def export_wireguard_configs(request):
 
     instances = WireGuardInstance.objects.all()
     base_dir = "/etc/wireguard"
+    os.makedirs(base_dir, exist_ok=True)
 
     export_firewall_configuration()
-    
+
     firewall_inserted = False
+
+    active_instance_conf_set = {f"wg{instance.instance_id}.conf" for instance in instances}
+    for old_conf_file in glob.glob(os.path.join(base_dir, "wg[0-9]*.conf")):
+        filename = os.path.basename(old_conf_file)
+        if filename not in active_instance_conf_set:
+            logging.info("Removing abandoned WireGuard config: %s", filename)
+            try:
+                os.remove(old_conf_file)
+            except FileNotFoundError:
+                pass
+            except IsADirectoryError:
+                continue
+            except PermissionError:
+                continue
+
     for instance in instances:
         if instance.legacy_firewall:
             post_up_processed = clean_command_field(instance.post_up) if instance.post_up else ""
@@ -157,8 +175,6 @@ def export_wireguard_configs(request):
         config_content = "\n".join(config_lines)
         config_path = os.path.join(base_dir, f"wg{instance.instance_id}.conf")
 
-        os.makedirs(base_dir, exist_ok=True)
-
         with open(config_path, "w") as config_file:
             config_file.write(config_content)
     if request.GET.get('action') == 'update_and_restart' or request.GET.get('action') == 'update_and_reload':