Skip to content

Commit

Permalink
Merge pull request #744 from chris5560/master
Browse files Browse the repository at this point in the history
luci-app-ddns: fix handling of parameter "is_glue" and "dns_seerver"
  • Loading branch information
hnyman committed Jun 19, 2016
2 parents cd50f27 + c37eb36 commit 65c7610
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion applications/luci-app-ddns/Makefile
Expand Up @@ -10,7 +10,7 @@ PKG_NAME:=luci-app-ddns

# Version == major.minor.patch
# increase on new functionality (minor) or patches (patch)
PKG_VERSION:=2.4.5
PKG_VERSION:=2.4.6

# Release == build
# increase on changes of translation files
Expand Down
8 changes: 4 additions & 4 deletions applications/luci-app-ddns/luasrc/controller/ddns.lua
Expand Up @@ -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.1" -- minimum version of service required
local srv_ver_min = "2.7.2" -- 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.4-1"
local app_version = "2.4.6-1"

function index()
local nxfs = require "nixio.fs" -- global definitions not available
Expand Down Expand Up @@ -193,8 +193,8 @@ local function _get_status()
local is_glue = tonumber(s["is_glue"] or 0)
local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
command = command .. [[ get_registered_ip ]] .. lookup_host .. [[ ]] .. use_ipv6 ..
[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver ..
[[ ]] .. is_glue
[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp ..
[[ ]] .. is_glue .. [[ ]] .. dnsserver
local reg_ip = SYS.exec(command)
if reg_ip == "" then
reg_ip = "_nodata_"
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-ddns/po/de/ddns.po
Expand Up @@ -439,7 +439,7 @@ msgstr ""
"Aktualisierungen über HTTPS Protokoll zu unterstützen."

msgid "Network"
msgstr ""
msgstr "Netzwerk"

msgid "Network on which the ddns-updater scripts will be started"
msgstr "Netzwerk auf dem Ereignisse die ddns-updater Skripte starten"
Expand Down

0 comments on commit 65c7610

Please sign in to comment.