diff options
author | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-09-25 10:53:13 +0200 |
---|---|---|
committer | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-09-25 10:53:13 +0200 |
commit | 2d9472db9fc0dc492281bd1238cb1678b4b5962c (patch) | |
tree | 4413975744ae21ef186c4f79bccad0121e91f26d /applications/luci-app-ddns/luasrc | |
parent | 07591d77aaf4194a8f7cf42d0a7e1c073c9a6e05 (diff) |
luci-app-ddns: ignore if name lookup progs not supporting force ip version
- no longer verify installed name lookup programs to set has_forceip flag inside tools/ddns.lua
- adapt messages inside hints.lua
Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Diffstat (limited to 'applications/luci-app-ddns/luasrc')
-rwxr-xr-x | applications/luci-app-ddns/luasrc/controller/ddns.lua | 4 | ||||
-rw-r--r-- | applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua | 4 | ||||
-rwxr-xr-x | applications/luci-app-ddns/luasrc/tools/ddns.lua | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index 1f2e6f2b9..b5c725f4f 100755 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -18,11 +18,11 @@ local UTIL = require "luci.util" local DDNS = require "luci.tools.ddns" -- ddns multiused functions local srv_name = "ddns-scripts" -local srv_ver_min = "2.7.2" -- minimum version of service required +local srv_ver_min = "2.7.4" -- minimum version of service required local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]] local app_name = "luci-app-ddns" local app_title = "Dynamic DNS" -local app_version = "2.4.6-1" +local app_version = "2.4.7-1" function index() local nxfs = require "nixio.fs" -- global definitions not available diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua index 1f5ad68c5..21827b765 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua @@ -116,9 +116,9 @@ if not DDNS.has_forceip then value = value .. "<br />- " .. translate("You should install 'wget' or 'curl' or 'uclient-fetch' package.") end - if not (DDNS.has_bindhost or DDNS.has_hostip) then + if not DDNS.has_bindhost then value = value .. "<br />- " .. - translate("You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package for DNS requests.") + translate("You should install 'bind-host' or 'knot-host' or 'drill' package for DNS requests.") end fi.value = value end diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 6b626b9e3..e55c67362 100755 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -31,7 +31,7 @@ has_nslookup = (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)" has_ipv6 = (NXFS.access("/proc/net/ipv6_route") and NXFS.access("/usr/sbin/ip6tables")) has_ssl = (has_wgetssl or has_curlssl or (has_fetch and has_fetchssl)) has_proxy = (has_wgetssl or has_curlpxy or has_fetch or has_bbwget) -has_forceip = ((has_wgetssl or has_curl or has_fetch) and (has_bindhost or has_hostip)) +has_forceip = (has_wgetssl or has_curl or has_fetch) -- only really needed for transfer has_dnsserver = (has_bindhost or has_hostip or has_nslookup) has_bindnet = (has_wgetssl or has_curl) has_cacerts = _check_certs() |