(tinc) polishing

net/tinc/Makefile

@@ -1,8 +1,7 @@
 PLUGIN_NAME=		tinc
-PLUGIN_VERSION=		0.2
+PLUGIN_VERSION=		1.0
 PLUGIN_COMMENT=		Tinc VPN
 PLUGIN_DEPENDS=		tinc
 PLUGIN_MAINTAINER=	ad@opnsense.org
-PLUGIN_PRIVATE=		yes
 
 .include "../../Mk/plugins.mk"

net/tinc/src/etc/rc.d/opnsense-tincd

@@ -15,6 +15,8 @@ stop_cmd=tincd_stop
 start_cmd=tincd_start
 rcvar=OPNtincd_enable
 
+load_rc_config $name
+
 [ -z "$OPNtincd_enable" ] && OPNtincd_enable="NO"
 
 # stop tincd

net/tinc/src/opnsense/service/conf/actions.d/actions_tinc.conf

@@ -5,19 +5,19 @@ type:script_output
 message:generate new keypair
 
 [stop]
-command:/usr/local/etc/rc.d/opnsense-tincd stop
+command:/usr/local/etc/rc.d/opnsense-tincd onestop
 parameters:
 type:script
 message:stop tincd
 
 [start]
-command:/usr/local/etc/rc.d/opnsense-tincd start
+command:/usr/local/etc/rc.d/opnsense-tincd onestart
 parameters:
 type:script
 message:start tincd
 
 [restart]
-command:/usr/local/etc/rc.d/opnsense-tincd restart
+command:/usr/local/etc/rc.d/opnsense-tincd onerestart
 parameters:
 type:script
 message:restart tincd

net/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml

@@ -1,6 +1,7 @@
 <networks>
 {% if helpers.exists('OPNsense.Tinc.networks.network') %}
 {%   for network in helpers.toList('OPNsense.Tinc.networks.network', 'id') %}
+{%     if network.enabled|default('0') == '1' %}
     <network>
         <id>{{network.id}}</id>
         <hostname>{{network.hostname}}</hostname>
@@ -31,6 +32,7 @@
 {%       endfor %}
         </hosts>
     </network>
+{%     endif %}
 {%   endfor %}
 {% endif %}
 </networks>