From 415d43cd7f8cd89c7f9ec26411b2fd4b82200341 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 28 Sep 2023 17:07:41 +0200 Subject: [PATCH] net/wireguard: small style update --- net/wireguard/pkg-descr | 2 +- net/wireguard/src/etc/rc.syshook.d/carp/20-wireguard | 2 +- .../OPNsense/Wireguard/forms/dialogEditWireguardServer.xml | 5 ++--- .../src/opnsense/scripts/Wireguard/wg-service-control.php | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/net/wireguard/pkg-descr b/net/wireguard/pkg-descr index 1b9ba24a0..71b66866a 100644 --- a/net/wireguard/pkg-descr +++ b/net/wireguard/pkg-descr @@ -18,7 +18,7 @@ Changelog 2.2 -* add vhid (carp) tracking support +* Add VHID (CARP) tracking support 2.1 diff --git a/net/wireguard/src/etc/rc.syshook.d/carp/20-wireguard b/net/wireguard/src/etc/rc.syshook.d/carp/20-wireguard index d8337b6bf..8c69f6f95 100755 --- a/net/wireguard/src/etc/rc.syshook.d/carp/20-wireguard +++ b/net/wireguard/src/etc/rc.syshook.d/carp/20-wireguard @@ -1,3 +1,3 @@ #!/bin/sh -configctl -dq wireguard configure \ No newline at end of file +configctl -dq wireguard configure diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml index 04bb1a71b..8c9b75761 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml @@ -61,10 +61,9 @@ server.carp_depend_on - + dropdown - The carp VHID to depend on, when this virtual address is not in master state, - the instance will be shutdown. + The CARP VHID to depend on. When this virtual address is not in master state, then the instance will be shutdown. server.peers diff --git a/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php b/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php index 9e56b0405..e51e05a07 100755 --- a/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php +++ b/net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php @@ -59,7 +59,7 @@ function get_vhid_status() /** * mimic wg-quick behaviour, but bound to our config */ -function wg_start($server, $fhandle, $ifcfgflag='up') +function wg_start($server, $fhandle, $ifcfgflag = 'up') { if (!does_interface_exist($server->interface)) { mwexecf('/sbin/ifconfig wg create name %s', [$server->interface]);