Work on service not starting #131

Author: rcmcdonald91

net/pfSense-pkg-WireGuard/files/usr/local/pkg/wireguard/wg_api.inc

@@ -910,13 +910,17 @@ function wg_is_valid_tunnel($tunnel_name, $running_state = false) {
 
 }
 
-// Checks if the service is enabled
+// Checks if the service is or should be enabled
 function wg_is_service_enabled() {
 	global $wgg;
 
 	$enable = $wgg['config']['enable'];
 
-	return (isset($enable) && (($enable === 'on') || $enable === 'yes'));
+	$is_enabled = (isset($enable) && (($enable === 'on') || $enable === 'yes'));
+
+	$should_be_enabled = wg_is_wg_assigned();
+
+	return ($is_enabled || $should_be_enabled);
 
 }
 

net/pfSense-pkg-WireGuard/files/usr/local/www/wg/vpn_wg_settings.php

@@ -106,8 +106,6 @@
 
 // Defaults for new installations
 
-$pconfig['enable'] 			= isset($wgg['config']['enable']) ? $wgg['config']['enable'] : 'off';
-
 $pconfig['keep_conf'] 			= isset($wgg['config']['keep_conf']) ? $wgg['config']['keep_conf'] : 'yes';
 
 $pconfig['resolve_interval'] 		= isset($wgg['config']['resolve_interval']) ? $wgg['config']['default_resolve_interval'] : $wgg['resolve_interval'];
@@ -161,7 +159,7 @@
 	'enable',
 	'Enable',
 	gettext('Enable WireGuard'),
-	$pconfig['enable'] == 'on'
+	wg_is_service_enabled()
 );
 
 $wg_enable->setHelp("<span class=\"text-danger\">Note: </span>
@@ -176,7 +174,7 @@
 		'enable',
 		'',
 		'hidden',
-		'yes'
+		(wg_is_service_enabled() ? 'yes' : 'no')
 	));
 
 }