From af7dcfcf3178281649afaf301f783eab7149eb66 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Tue, 23 Jan 2018 17:35:58 +0100
Subject: [PATCH] Anpassungen an 2018.1.x
Siehe https://github.com/freifunk-gluon/gluon/commit/7ccdacd294e5fcb6718f806543bb2620c02c9ddb
---
README.md | 2 ++
gluon-ssid-changer/check_site.lua | 18 ++++++++----------
.../luasrc/lib/gluon/upgrade/500-ssid-changer | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index 877296e..8435702 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
gluon-ssid-changer
==================
+_This branch of the script contains the ssid-changer version for the gluon 2018.1.x branch. For the 2017.1.x release of Gluon use the branch "lede"._
+
This package adds a script to change the SSID to an Offline-SSID when there is
no connection to any gateway.
This SSID can be generated from the nodes hostname with the first
diff --git a/gluon-ssid-changer/check_site.lua b/gluon-ssid-changer/check_site.lua
index cbee310..ab4c2a6 100644
--- a/gluon-ssid-changer/check_site.lua
+++ b/gluon-ssid-changer/check_site.lua
@@ -1,11 +1,9 @@
-if need_table('ssid_changer', nil, false) then
- need_boolean('ssid_changer.enabled', false)
- need_number('ssid_changer.switch_timeframe', false)
- need_number('ssid_changer.first', false)
- need_string('ssid_changer.prefix', false)
- need_string('ssid_changer.suffix', false)
- if need_boolean('ssid_changer.tq_limit_enabled', false) then
- need_number('ssid_changer.tq_limit_max', false)
- need_number('ssid_changer.tq_limit_min', false)
- end
+need_boolean({'ssid_changer', 'enabled'}, false)
+need_number({'ssid_changer', 'switch_timeframe'}, false)
+need_number({'ssid_changer', 'first'}, false)
+need_string({'ssid_changer', 'prefix'}, false)
+need_one_of({'ssid_changer', 'suffix'}, {'nodename', 'mac', 'none'}, false)
+if need_boolean({'ssid_changer','tq_limit_enabled'}, false) then
+ need_number({'ssid_changer', 'tq_limit_max'}, false)
+ need_number({'ssid_changer', 'tq_limit_min'}, false)
end
diff --git a/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer b/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
index f98ff82..549f841 100755
--- a/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
+++ b/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
@@ -1,6 +1,6 @@
#!/usr/bin/lua
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
local uci = require('simple-uci').cursor()
@@ -13,9 +13,9 @@ elseif not uci:get('ssid-changer', 'settings', 'enabled') then
first = site.ssid_changer.first or '5',
prefix = site.ssid_changer.prefix or 'FF_Offline_',
suffix = site.ssid_changer.suffix or 'nodename',
- tq_limit_enabled = site.ssid_changer.tq_limit_enabled or '0',
- tq_limit_max = site.ssid_changer.tq_limit_max or '45',
- tq_limit_min = site.ssid_changer.tq_limit_min or '35',
+ tq_limit_enabled = site.ssid_changer.tq_limit_enabled or false,
+ tq_limit_max = site.ssid_changer.tq_limit_max or 45,
+ tq_limit_min = site.ssid_changer.tq_limit_min or 35,
})
uci:save('ssid-changer')
end
--
GitLab