From 3374c8b82fab77a641b8bd9029f5ef11605a7bec Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 1 Feb 2018 09:50:56 +0100
Subject: [PATCH] net/zerotier: merge version 1.3.1 from master

---
 net/zerotier/Makefile                                           | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt     | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt  | 2 +-
 .../src/opnsense/service/templates/OPNsense/zerotier/zerotier   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
index 5ff20188d..a052ecc4d 100644
--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		zerotier
-PLUGIN_VERSION=		1.3.0
+PLUGIN_VERSION=		1.3.1
 PLUGIN_COMMENT=		Virtual Networks That Just Work
 PLUGIN_DEPENDS=		zerotier
 PLUGIN_MAINTAINER=	dharrigan@gmail.com
diff --git a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt
index 44a4272de..8fde2ac38 100644
--- a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt
+++ b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/index.volt
@@ -27,7 +27,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 #}
-<script type="text/javascript">
+<script>
 
     $(document).ready(function() {
 
diff --git a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt
index 8a0a7c0bd..291a674b9 100644
--- a/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt
+++ b/net/zerotier/src/opnsense/mvc/app/views/OPNsense/Zerotier/overview.volt
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 {% set networksFirstRow = true, peersFirstRow = true %}
 
-<script type="text/javascript">
+<script>
     $(document).ready(function() {
         $("#network_details_collapse_all").click(function() {
             $(".network_details").collapse('toggle');
diff --git a/net/zerotier/src/opnsense/service/templates/OPNsense/zerotier/zerotier b/net/zerotier/src/opnsense/service/templates/OPNsense/zerotier/zerotier
index b7faa4105..78740ebaa 100644
--- a/net/zerotier/src/opnsense/service/templates/OPNsense/zerotier/zerotier
+++ b/net/zerotier/src/opnsense/service/templates/OPNsense/zerotier/zerotier
@@ -6,3 +6,4 @@ zerotier_enable="YES"
 {% else %}
 zerotier_enable="NO"
 {% endif %}
+zerotier_var_mfs="/var/db/zerotier-one"