From b06dea87ec7c86127a474667f403dfe6fc024a9c Mon Sep 17 00:00:00 2001 From: viisauksena Date: Sat, 5 Nov 2016 06:08:34 +0100 Subject: [PATCH] simplify code of fastd_config enabled and fastd_syslog_level --- .../luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd index 2c56ad97..bdb62842 100755 --- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd +++ b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd @@ -15,17 +15,9 @@ users.remove_user('gluon-fastd') users.add_group('gluon-fastd', 800) -local enabled = uci:get('fastd', 'mesh_vpn', 'enabled') -if not enabled then - enabled = site.fastd_mesh_vpn.enabled and 1 or 0 -end - - -local syslog_level = uci:get('fastd', 'mesh_vpn', 'syslog_level') -if not syslog_level then - syslog_level = 'verbose' -end +local enabled = uci:get('fastd', 'mesh_vpn', 'enabled') and 1 or 0 +local syslog_level = uci:get('fastd', 'mesh_vpn', 'syslog_level') or 'verbose' local methods @@ -37,7 +29,6 @@ if site.fastd_mesh_vpn.configurable then has_null = lutil.contains(old_methods, 'null') end - methods = {} if has_null then table.insert(methods, 'null')