From 112e519ad8a717fe43fc4b7bd34bba3a97d7cb91 Mon Sep 17 00:00:00 2001 From: Cyrus Fox Date: Fri, 14 Jul 2017 12:25:41 +0200 Subject: [PATCH] Gluon-mesh-vpn-core: Moved migration code to own script It is mandatory that it runs after the initial configuration is in place. --- .../luasrc/lib/gluon/upgrade/400-mesh-vpn | 16 ------------- .../lib/gluon/upgrade/420-mesh-vpn-migration | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100755 package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/420-mesh-vpn-migration diff --git a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/400-mesh-vpn b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/400-mesh-vpn index 6ab719db..36929b95 100755 --- a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/400-mesh-vpn +++ b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/400-mesh-vpn @@ -58,19 +58,3 @@ uci:section('firewall', 'include', 'mesh_vpn_dns', { }) uci:save('firewall') - - --- VPN migration -local has_fastd = fs.access('/lib/gluon/mesh-vpn/fastd') -local fastd_enabled = uci:get_bool("fastd", "mesh_vpn", "enabled") - -local has_tunneldigger = fs.access('/lib/gluon/mesh-vpn/tunneldigger') -local tunneldigger_enabled = uci:get_bool("tunneldigger", "mesh_vpn", "enabled") - -local enabled = fastd_enabled or tunneldigger_enabled or false - -uci:set("fastd", "mesh_vpn", "enabled", has_fastd and enabled) -uci:save("fastd") - -uci:set("tunneldigger", "mesh_vpn", "enabled", has_tunneldigger and enabled) -uci:save("tunneldigger") diff --git a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/420-mesh-vpn-migration b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/420-mesh-vpn-migration new file mode 100755 index 00000000..5a447b99 --- /dev/null +++ b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/420-mesh-vpn-migration @@ -0,0 +1,23 @@ +#!/usr/bin/lua + +local site = require 'gluon.site_config' +local users = require 'gluon.users' +local util = require 'gluon.util' +local fs = require 'nixio.fs' + +local uci = require('simple-uci').cursor() + +-- VPN migration +local has_fastd = fs.access('/lib/gluon/mesh-vpn/fastd') +local fastd_enabled = uci:get_bool("fastd", "mesh_vpn", "enabled") + +local has_tunneldigger = fs.access('/lib/gluon/mesh-vpn/tunneldigger') +local tunneldigger_enabled = uci:get_bool("tunneldigger", "mesh_vpn", "enabled") + +local enabled = fastd_enabled or tunneldigger_enabled or false + +uci:set("fastd", "mesh_vpn", "enabled", has_fastd and enabled) +uci:save("fastd") + +uci:set("tunneldigger", "mesh_vpn", "enabled", has_tunneldigger and enabled) +uci:save("tunneldigger")