diff options
| author | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-03-07 10:57:44 +0100 |
|---|---|---|
| committer | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-03-07 10:57:44 +0100 |
| commit | d26bffefb360cf3b9f0698f48f18dbac083d65a2 (patch) | |
| tree | d116635ccf548f65fba1c1c34d2aef8848c353b5 /applications/luci-app-ddns/luasrc | |
| parent | ddc893ccc254e79b0869c709ada07f5ae232a0e3 (diff) | |
| parent | e1fb9e579a69406f0c7c632792f9602de0609709 (diff) | |
Merge pull request #664 from chris5560/master
luci-app-ddns: fixes because uclient-fetch support "force ip version"
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 7cfbc56a0..652c24438 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.6.0" -- minimum version of service required +local srv_ver_min = "2.6.3" -- 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.1-1" +local app_version = "2.4.2-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 335bb01b2..3f5997463 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua @@ -112,9 +112,9 @@ if not DDNS.has_forceip then translate("Force IP Version not supported") .. bold_off local value = translate("BusyBox's nslookup and Wget do not support to specify " .. "the IP version to use for communication with DDNS Provider!") - if not (DDNS.has_wgetssl or DDNS.has_curl) then + if not (DDNS.has_wgetssl or DDNS.has_curl or DDNS.has_fetch) then value = value .. "<br />- " .. - translate("You should install GNU Wget with SSL (prefered) or cURL package.") + translate("You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch package.") end if not (DDNS.has_bindhost or DDNS.has_hostip) then value = value .. "<br />- " .. diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 54791432b..b326cd120 100755 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -29,7 +29,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) and (has_bindhost or has_hostip)) +has_forceip = ((has_wgetssl or has_curl or has_fetch) and (has_bindhost or has_hostip)) has_dnsserver = (has_bindhost or has_hostip or has_nslookup) has_bindnet = (has_wgetssl or has_curl) has_cacerts = _check_certs() |