Add reload option for WireGuard service

templates/base.html

@@ -247,10 +247,12 @@
                 {% if pending_changes_warning %}
                     <div class="alert alert-warning" role="alert">
                         <h4 class="alert-heading">Update Required</h4>
-                        <p>Your WireGuard settings have been modified. To apply these changes, please update the configuration and reload the WireGuard service.
+                        <p>
+                            Your WireGuard settings have been modified. To apply these changes, please update the configuration and reload the WireGuard service.
                         </p>
                         <p>
                             <a href="/tools/export_wireguard_config/?action=update_and_restart" class="btn btn-secondary">Update and restart service</a>
+                            <a href="/tools/export_wireguard_config/?action=update_and_reload" class="btn btn-secondary">Update and reload service</a>
                         </p>
 
                     </div>

templates/wireguard/wireguard_status.html

@@ -8,6 +8,7 @@
     <div class="card-header">
         <a href='/tools/export_wireguard_config/' class='btn btn-outline-primary'>Update Configuration</a>
         <a href='/tools/restart_wireguard/' class='btn btn-outline-primary'>Restart Wireguard service</a>
+        <a href='/tools/restart_wireguard/?mode=reload' class='btn btn-outline-primary'>Reload Wireguard service</a>
 
         <div class="btn-group float-right" role="group" aria-label="Graph interval">
             <a href="?period=6h" data-period="6h" class="btn btn-outline-primary">6h</a>

wireguard_tools/views.py

@@ -7,17 +7,17 @@ import qrcode
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
-from django.shortcuts import redirect, get_object_or_404, render, Http404
+from django.shortcuts import Http404, get_object_or_404, redirect, render
 from django.utils import timezone
 
 from dns.views import export_dns_configuration
 from firewall.models import RedirectRule
-from firewall.tools import generate_firewall_header, generate_firewall_footer, generate_port_forward_firewall, \
+from firewall.tools import export_user_firewall, generate_firewall_footer, generate_firewall_header, \
-    export_user_firewall, generate_redirect_dns_rules
+    generate_port_forward_firewall, generate_redirect_dns_rules
 from user_manager.models import UserAcl
 from vpn_invite.models import PeerInvite
 from wgwadmlibrary.tools import user_has_access_to_peer
-from wireguard.models import WireGuardInstance, Peer, PeerAllowedIP
+from wireguard.models import Peer, PeerAllowedIP, WireGuardInstance
 
 
 def clean_command_field(command_field):
@@ -155,9 +155,14 @@ def export_wireguard_configs(request):
 
         with open(config_path, "w") as config_file:
             config_file.write(config_content)
-    messages.success(request, "Export successful!|WireGuard configuration files have been exported to /etc/wireguard/. Don't forget to restart the interfaces.")
+    if request.GET.get('action') == 'update_and_restart' or request.GET.get('action') == 'update_and_reload':
+        messages.success(request, "Export successful!|WireGuard configuration files have been exported to /etc/wireguard/.")
+    else:
+        messages.success(request, "Export successful!|WireGuard configuration files have been exported to /etc/wireguard/. Don't forget to restart the interfaces.")
     if request.GET.get('action') == 'update_and_restart':
         return redirect('/tools/restart_wireguard/?action=dismiss_warning')
+    elif request.GET.get('action') == 'update_and_reload':
+        return redirect('/tools/restart_wireguard/?action=dismiss_warning&mode=reload')
     return redirect('/status/')
 
 
@@ -215,37 +220,67 @@ def download_config_or_qrcode(request):
 def restart_wireguard_interfaces(request):
     if not UserAcl.objects.filter(user=request.user).filter(user_level__gte=30).exists():
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
-    
+    mode = request.GET.get('mode', 'restart')
     config_dir = "/etc/wireguard"
     interface_count = 0
     error_count = 0
-
     for filename in os.listdir(config_dir):
         if filename.endswith(".conf"):
             interface_name = filename[:-5]
-            stop_command = f"wg-quick down {interface_name}"
+            if mode == "reload":
-            stop_result = subprocess.run(stop_command, shell=True, capture_output=True, text=True)
+                config_path = os.path.join(config_dir, filename)
-            if stop_result.returncode != 0:
+                with open(config_path, 'r') as f:
-                messages.warning(request, f"Error stopping {interface_name}|{stop_result.stderr}")
+                    lines = f.readlines()
-                error_count += 1
+                filtered_lines = []
-            start_command = f"wg-quick up {interface_name}"
+                for line in lines:
-            start_result = subprocess.run(start_command, shell=True, capture_output=True, text=True)
+                    stripped_line = line.strip()
-            if start_result.returncode != 0:
+                    if stripped_line.startswith("Address") or stripped_line.startswith("ListenPort") \
-                messages.warning(request, f"Error starting {interface_name}|{start_result.stderr}")
+                            or stripped_line.startswith("PostUp") or stripped_line.startswith("PostDown"):
-                error_count += 1
+                        continue
+                    filtered_lines.append(line)
+
+                temp_config_path = f"/tmp/wgreload_{interface_name}.conf"
+                with open(temp_config_path, 'w') as f:
+                    f.writelines(filtered_lines)
+
+                reload_command = f"wg syncconf {interface_name} {temp_config_path}"
+                result = subprocess.run(reload_command, shell=True, capture_output=True, text=True)
+                os.remove(temp_config_path)
+
+                if result.returncode != 0:
+                    messages.warning(request, f"Error reloading {interface_name}|{result.stderr}")
+                    error_count += 1
+                else:
+                    interface_count += 1
+
             else:
-                interface_count += 1
+                stop_command = f"wg-quick down {interface_name}"
+                stop_result = subprocess.run(stop_command, shell=True, capture_output=True, text=True)
+                if stop_result.returncode != 0:
+                    messages.warning(request, f"Error stopping {interface_name}|{stop_result.stderr}")
+                    error_count += 1
+                start_command = f"wg-quick up {interface_name}"
+                start_result = subprocess.run(start_command, shell=True, capture_output=True, text=True)
+                if start_result.returncode != 0:
+                    messages.warning(request, f"Error starting {interface_name}|{start_result.stderr}")
+                    error_count += 1
+                else:
+                    interface_count += 1
 
     if interface_count > 0 and error_count == 0:
-        if interface_count == 1:
+        if mode == 'reload':
-            messages.success(request, "Interface restarted|The WireGuard interface has been restarted.")
+            verbose_mode = 'reloaded'
         else:
-            messages.success(request, f"Interfaces restarted|{interface_count} WireGuard interfaces have been restarted.")
+            verbose_mode = 'restarted'
+        if interface_count == 1:
+            messages.success(request, f"Interface {verbose_mode}|The WireGuard interface has been {verbose_mode}.")
+        else:
+            messages.success(request, f"Interfaces {verbose_mode}|{interface_count} WireGuard interfaces have been {verbose_mode}.")
     elif error_count > 0:
-        messages.warning(request, f"Errors encountered|There were errors restarting some interfaces. See warnings for details.")
+        messages.warning(request, f"Errors encountered|There were errors {mode}ing some interfaces. See warnings for details.")
 
     if interface_count == 0 and error_count == 0:
-        messages.info(request, "No interfaces found|No WireGuard interfaces were found to restart.")
+        messages.info(request, f"No interfaces found|No WireGuard interfaces were found to {mode}.")
     if request.GET.get('action') == 'dismiss_warning':
         for wireguard_instancee in WireGuardInstance.objects.filter(pending_changes=True):
             wireguard_instancee.pending_changes = False