Merge pull request #664 from chris5560/master

luci-app-ddns: fixes because uclient-fetch support "force ip version"
This commit is contained in:
Christian Schoenebeck 2016-03-07 10:57:44 +01:00
commit d26bffefb3
6 changed files with 21 additions and 171 deletions

View file

@ -10,7 +10,7 @@ PKG_NAME:=luci-app-ddns
# Version == major.minor.patch # Version == major.minor.patch
# increase on new functionality (minor) or patches (patch) # increase on new functionality (minor) or patches (patch)
PKG_VERSION:=2.4.1 PKG_VERSION:=2.4.2
# Release == build # Release == build
# increase on changes of translation files # increase on changes of translation files

View file

@ -18,11 +18,11 @@ local UTIL = require "luci.util"
local DDNS = require "luci.tools.ddns" -- ddns multiused functions local DDNS = require "luci.tools.ddns" -- ddns multiused functions
local srv_name = "ddns-scripts" 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 srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]]
local app_name = "luci-app-ddns" local app_name = "luci-app-ddns"
local app_title = "Dynamic DNS" local app_title = "Dynamic DNS"
local app_version = "2.4.1-1" local app_version = "2.4.2-1"
function index() function index()
local nxfs = require "nixio.fs" -- global definitions not available local nxfs = require "nixio.fs" -- global definitions not available

View file

@ -112,9 +112,9 @@ if not DDNS.has_forceip then
translate("Force IP Version not supported") .. bold_off translate("Force IP Version not supported") .. bold_off
local value = translate("BusyBox's nslookup and Wget do not support to specify " .. local value = translate("BusyBox's nslookup and Wget do not support to specify " ..
"the IP version to use for communication with DDNS Provider!") "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 />- " .. 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 end
if not (DDNS.has_bindhost or DDNS.has_hostip) then if not (DDNS.has_bindhost or DDNS.has_hostip) then
value = value .. "<br />- " .. value = value .. "<br />- " ..

View file

@ -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_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_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_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_dnsserver = (has_bindhost or has_hostip or has_nslookup)
has_bindnet = (has_wgetssl or has_curl) has_bindnet = (has_wgetssl or has_curl)
has_cacerts = _check_certs() has_cacerts = _check_certs()

View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: luci-app-ddns 2.4.0-1\n" "Project-Id-Version: luci-app-ddns 2.4.2-1\n"
"POT-Creation-Date: 2016-01-30 11:07+0100\n" "POT-Creation-Date: 2016-02-29 20:55+0100\n"
"PO-Revision-Date: 2016-01-30 11:07+0100\n" "PO-Revision-Date: 2016-02-29 20:58+0100\n"
"Last-Translator: Christian Schoenebeck <christian.schoenebeck@gmail.com>\n" "Last-Translator: Christian Schoenebeck <christian.schoenebeck@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
@ -17,21 +17,12 @@ msgstr ""
msgid "&" msgid "&"
msgstr "&" msgstr "&"
msgid "-- custom --"
msgstr "-- benutzerdefiniert --"
msgid "-- default --" msgid "-- default --"
msgstr "-- Standard --" msgstr "-- Standard --"
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
msgid "Allow non-public IP's" msgid "Allow non-public IP's"
msgstr "Erlaube Nicht-öffentliche IPs" msgstr "Erlaube Nicht-öffentliche IPs"
msgid "Applying changes"
msgstr "Änderungen anwenden"
msgid "Basic Settings" msgid "Basic Settings"
msgstr "Grundlegende Einstellungen" msgstr "Grundlegende Einstellungen"
@ -83,15 +74,9 @@ msgstr "Anbieter wechseln"
msgid "Check Interval" msgid "Check Interval"
msgstr "Prüfinterval" msgstr "Prüfinterval"
msgid "Collecting data..."
msgstr "Sammle Daten..."
msgid "Config error" msgid "Config error"
msgstr "Konfigurationsfehler" msgstr "Konfigurationsfehler"
msgid "Configuration"
msgstr "Einstellungen"
msgid "" msgid ""
"Configure here the details for all Dynamic DNS services including this LuCI " "Configure here the details for all Dynamic DNS services including this LuCI "
"application." "application."
@ -209,9 +194,6 @@ msgstr ""
"Das Verzeichnis enthält die PID und andere Statusinformationen aller " "Das Verzeichnis enthält die PID und andere Statusinformationen aller "
"laufenden Konfigurationen." "laufenden Konfigurationen."
msgid "Disabled"
msgstr "Deaktiviert"
msgid "Domain" msgid "Domain"
msgstr "Domäne" msgstr "Domäne"
@ -228,12 +210,6 @@ msgstr ""
msgid "Enable secure communication with DDNS provider" msgid "Enable secure communication with DDNS provider"
msgstr "Aktiviert sichere Kommunikation mit dem DDNS Anbieter" msgstr "Aktiviert sichere Kommunikation mit dem DDNS Anbieter"
msgid "Enabled"
msgstr "Aktiviert"
msgid "Error"
msgstr "Fehler"
msgid "Error Retry Counter" msgid "Error Retry Counter"
msgstr "Wiederholungszähler bei Fehler" msgstr "Wiederholungszähler bei Fehler"
@ -243,9 +219,6 @@ msgstr "Wiederholungsintervall bei Fehler"
msgid "Event Network" msgid "Event Network"
msgstr "Ereignis Netzwerk" msgstr "Ereignis Netzwerk"
msgid "File"
msgstr "Datei"
msgid "File not found" msgid "File not found"
msgstr "Datei nicht gefunden" msgstr "Datei nicht gefunden"
@ -294,9 +267,6 @@ msgstr ""
"GNU Wget verwendet die IP des gewählten Netzwerkes; cURL verwendet die " "GNU Wget verwendet die IP des gewählten Netzwerkes; cURL verwendet die "
"physikalische Schnittstelle." "physikalische Schnittstelle."
msgid "Global Settings"
msgstr "Globale Einstellungen"
msgid "HTTPS not supported" msgid "HTTPS not supported"
msgstr "HTTPS nicht unterstützt" msgstr "HTTPS nicht unterstützt"
@ -314,9 +284,6 @@ msgstr "IP-Adressquelle"
msgid "IP address version" msgid "IP address version"
msgstr "IP-Adressversion" msgstr "IP-Adressversion"
msgid "IPv4-Address"
msgstr "IPv4-Adresse"
msgid "IPv6 address must be given in square brackets" msgid "IPv6 address must be given in square brackets"
msgstr "Eine IPv6 Adresse muss in eckigen Klammern angegeben werden" msgstr "Eine IPv6 Adresse muss in eckigen Klammern angegeben werden"
@ -332,9 +299,6 @@ msgstr ""
msgid "IPv6 not supported" msgid "IPv6 not supported"
msgstr "IPv6 nicht unterstützt" msgstr "IPv6 nicht unterstützt"
msgid "IPv6-Address"
msgstr "IPv6-Adresse"
msgid "If both cURL and GNU Wget are installed, Wget is used by default." msgid "If both cURL and GNU Wget are installed, Wget is used by default."
msgstr "Wenn cURL und GNU Wget installiert sind, wird Wget verwendet." msgstr "Wenn cURL und GNU Wget installiert sind, wird Wget verwendet."
@ -363,9 +327,6 @@ msgstr ""
"In einigen Versionen von OpenWrt wurde cURL/libcurl ohne Proxy Unterstützung " "In einigen Versionen von OpenWrt wurde cURL/libcurl ohne Proxy Unterstützung "
"compiliert." "compiliert."
msgid "Info"
msgstr "Informationen"
msgid "" msgid ""
"Install ca-certificates package or needed certificates by hand into /etc/ssl/" "Install ca-certificates package or needed certificates by hand into /etc/ssl/"
"certs default directory" "certs default directory"
@ -373,9 +334,6 @@ msgstr ""
"Installieren Sie das ca-certificate Paket oder die benötigten Zertifikate " "Installieren Sie das ca-certificate Paket oder die benötigten Zertifikate "
"von Hand in das Standardverzeichnis /etc/ssl/certs" "von Hand in das Standardverzeichnis /etc/ssl/certs"
msgid "Interface"
msgstr "Schnittstelle"
msgid "" msgid ""
"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds " "Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
"are not supported" "are not supported"
@ -400,9 +358,6 @@ msgstr ""
msgid "Last Update" msgid "Last Update"
msgstr "Letztes Aktualisierung" msgstr "Letztes Aktualisierung"
msgid "Loading"
msgstr "Lade"
msgid "Log File Viewer" msgid "Log File Viewer"
msgstr "Protokolldatei" msgstr "Protokolldatei"
@ -438,9 +393,6 @@ msgstr ""
"Weder GNU Wget mit SSL noch cURL sind installiert um Aktualisierungen über " "Weder GNU Wget mit SSL noch cURL sind installiert um Aktualisierungen über "
"HTTPS Protokoll zu unterstützen." "HTTPS Protokoll zu unterstützen."
msgid "Network"
msgstr "Netzwerk"
msgid "Network on which the ddns-updater scripts will be started" msgid "Network on which the ddns-updater scripts will be started"
msgstr "Netzwerk auf dem Ereignisse die ddns-updater Skripte starten" msgstr "Netzwerk auf dem Ereignisse die ddns-updater Skripte starten"
@ -462,9 +414,6 @@ msgstr "Keine Protokollierung"
msgid "Non-public and by default blocked IP's" msgid "Non-public and by default blocked IP's"
msgstr "Nicht-öffentliche und standardmäßig blockierte IPs." msgstr "Nicht-öffentliche und standardmäßig blockierte IPs."
msgid "Notice"
msgstr "Notiz"
msgid "Number of last lines stored in log files" msgid "Number of last lines stored in log files"
msgstr "" msgstr ""
"Anzahl der letzten Zeilen die in der Protokolldatei gespeichert werden." "Anzahl der letzten Zeilen die in der Protokolldatei gespeichert werden."
@ -511,21 +460,12 @@ msgstr "Optional: Ersetzt [PARAMENC] in der Update-URL (URL-codiert)"
msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)" msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)"
msgstr "Optional: Ersetzt [PARAMENC] in der Update-URL (NICHT URL-codiert)" msgstr "Optional: Ersetzt [PARAMENC] in der Update-URL (NICHT URL-codiert)"
msgid "Overview"
msgstr "Übersicht"
msgid "PROXY-Server" msgid "PROXY-Server"
msgstr "Proxy-Server" msgstr "Proxy-Server"
msgid "PROXY-Server not supported" msgid "PROXY-Server not supported"
msgstr "Proxy-Server nicht unterstützt" msgstr "Proxy-Server nicht unterstützt"
msgid "Password"
msgstr "Passwort"
msgid "Path to CA-Certificate"
msgstr "Pfad zum CA-Zertifikat"
msgid "Please [Save & Apply] your changes first" msgid "Please [Save & Apply] your changes first"
msgstr "Bitte [Speichern & Anwenden] Sie Änderungen zunächst" msgstr "Bitte [Speichern & Anwenden] Sie Änderungen zunächst"
@ -571,9 +511,6 @@ msgstr "Softwareaktualisierung nötig"
msgid "Specifying a DNS-Server is not supported" msgid "Specifying a DNS-Server is not supported"
msgstr "Die Angabe eines DNS-Server wird nicht unterstützt" msgstr "Die Angabe eines DNS-Server wird nicht unterstützt"
msgid "Start"
msgstr "Start"
msgid "Start / Stop" msgid "Start / Stop"
msgstr "Start / Stopp" msgstr "Start / Stopp"
@ -635,27 +572,12 @@ msgstr ""
"Definiert das Skript mit dem die aktuelle IP-Adresse des System gelesen " "Definiert das Skript mit dem die aktuelle IP-Adresse des System gelesen "
"wird." "wird."
msgid "Username"
msgstr "Benutzername"
msgid "Using specific DNS Server not supported" msgid "Using specific DNS Server not supported"
msgstr "Verwendung spezifischer DNS-Server wird nicht unterstützt" msgstr "Verwendung spezifischer DNS-Server wird nicht unterstützt"
msgid "Verify"
msgstr "überprüfen"
msgid "Version"
msgstr "Version"
msgid "Version Information" msgid "Version Information"
msgstr "Versionsinformationen" msgstr "Versionsinformationen"
msgid "Waiting for changes to be applied..."
msgstr "Änderungen werden angewandt..."
msgid "Warning"
msgstr "Warnung"
msgid "" msgid ""
"Writes detailed messages to log file. File will be truncated automatically." "Writes detailed messages to log file. File will be truncated automatically."
msgstr "" msgstr ""
@ -685,6 +607,13 @@ msgid "You should install BIND host package for DNS requests."
msgstr "" msgstr ""
"Sie sollten das Programmpakete BIND host for DNS Anfragen installieren." "Sie sollten das Programmpakete BIND host for DNS Anfragen installieren."
msgid ""
"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch "
"package."
msgstr ""
"Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL oder "
"uclient-fetch installieren."
msgid "You should install GNU Wget with SSL (prefered) or cURL package." msgid "You should install GNU Wget with SSL (prefered) or cURL package."
msgstr "" msgstr ""
"Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL " "Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL "
@ -730,9 +659,6 @@ msgstr "hier aktivieren"
msgid "file or directory not found or not 'IGNORE'" msgid "file or directory not found or not 'IGNORE'"
msgstr "Datei oder Verzeichnis nicht gefunden oder nicht 'IGNORE'" msgstr "Datei oder Verzeichnis nicht gefunden oder nicht 'IGNORE'"
msgid "help"
msgstr "Hilfe"
msgid "hours" msgid "hours"
msgstr "Stunden" msgstr "Stunden"

View file

@ -4,21 +4,12 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "&" msgid "&"
msgstr "" msgstr ""
msgid "-- custom --"
msgstr ""
msgid "-- default --" msgid "-- default --"
msgstr "" msgstr ""
msgid "Advanced Settings"
msgstr ""
msgid "Allow non-public IP's" msgid "Allow non-public IP's"
msgstr "" msgstr ""
msgid "Applying changes"
msgstr ""
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
@ -61,15 +52,9 @@ msgstr ""
msgid "Check Interval" msgid "Check Interval"
msgstr "" msgstr ""
msgid "Collecting data..."
msgstr ""
msgid "Config error" msgid "Config error"
msgstr "" msgstr ""
msgid "Configuration"
msgstr ""
msgid "" msgid ""
"Configure here the details for all Dynamic DNS services including this LuCI " "Configure here the details for all Dynamic DNS services including this LuCI "
"application." "application."
@ -160,9 +145,6 @@ msgid ""
"Directory contains PID and other status information for each running section" "Directory contains PID and other status information for each running section"
msgstr "" msgstr ""
msgid "Disabled"
msgstr ""
msgid "Domain" msgid "Domain"
msgstr "" msgstr ""
@ -177,12 +159,6 @@ msgstr ""
msgid "Enable secure communication with DDNS provider" msgid "Enable secure communication with DDNS provider"
msgstr "" msgstr ""
msgid "Enabled"
msgstr ""
msgid "Error"
msgstr ""
msgid "Error Retry Counter" msgid "Error Retry Counter"
msgstr "" msgstr ""
@ -192,9 +168,6 @@ msgstr ""
msgid "Event Network" msgid "Event Network"
msgstr "" msgstr ""
msgid "File"
msgstr ""
msgid "File not found" msgid "File not found"
msgstr "" msgstr ""
@ -238,9 +211,6 @@ msgid ""
"interface." "interface."
msgstr "" msgstr ""
msgid "Global Settings"
msgstr ""
msgid "HTTPS not supported" msgid "HTTPS not supported"
msgstr "" msgstr ""
@ -256,9 +226,6 @@ msgstr ""
msgid "IP address version" msgid "IP address version"
msgstr "" msgstr ""
msgid "IPv4-Address"
msgstr ""
msgid "IPv6 address must be given in square brackets" msgid "IPv6 address must be given in square brackets"
msgstr "" msgstr ""
@ -271,9 +238,6 @@ msgstr ""
msgid "IPv6 not supported" msgid "IPv6 not supported"
msgstr "" msgstr ""
msgid "IPv6-Address"
msgstr ""
msgid "If both cURL and GNU Wget are installed, Wget is used by default." msgid "If both cURL and GNU Wget are installed, Wget is used by default."
msgstr "" msgstr ""
@ -294,17 +258,11 @@ msgid ""
"In some versions cURL/libcurl in OpenWrt is compiled without proxy support." "In some versions cURL/libcurl in OpenWrt is compiled without proxy support."
msgstr "" msgstr ""
msgid "Info"
msgstr ""
msgid "" msgid ""
"Install ca-certificates package or needed certificates by hand into /etc/ssl/" "Install ca-certificates package or needed certificates by hand into /etc/ssl/"
"certs default directory" "certs default directory"
msgstr "" msgstr ""
msgid "Interface"
msgstr ""
msgid "" msgid ""
"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds " "Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
"are not supported" "are not supported"
@ -322,9 +280,6 @@ msgstr ""
msgid "Last Update" msgid "Last Update"
msgstr "" msgstr ""
msgid "Loading"
msgstr ""
msgid "Log File Viewer" msgid "Log File Viewer"
msgstr "" msgstr ""
@ -356,9 +311,6 @@ msgid ""
"protocol." "protocol."
msgstr "" msgstr ""
msgid "Network"
msgstr ""
msgid "Network on which the ddns-updater scripts will be started" msgid "Network on which the ddns-updater scripts will be started"
msgstr "" msgstr ""
@ -380,9 +332,6 @@ msgstr ""
msgid "Non-public and by default blocked IP's" msgid "Non-public and by default blocked IP's"
msgstr "" msgstr ""
msgid "Notice"
msgstr ""
msgid "Number of last lines stored in log files" msgid "Number of last lines stored in log files"
msgstr "" msgstr ""
@ -422,21 +371,12 @@ msgstr ""
msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)" msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)"
msgstr "" msgstr ""
msgid "Overview"
msgstr ""
msgid "PROXY-Server" msgid "PROXY-Server"
msgstr "" msgstr ""
msgid "PROXY-Server not supported" msgid "PROXY-Server not supported"
msgstr "" msgstr ""
msgid "Password"
msgstr ""
msgid "Path to CA-Certificate"
msgstr ""
msgid "Please [Save & Apply] your changes first" msgid "Please [Save & Apply] your changes first"
msgstr "" msgstr ""
@ -482,9 +422,6 @@ msgstr ""
msgid "Specifying a DNS-Server is not supported" msgid "Specifying a DNS-Server is not supported"
msgstr "" msgstr ""
msgid "Start"
msgstr ""
msgid "Start / Stop" msgid "Start / Stop"
msgstr "" msgstr ""
@ -540,27 +477,12 @@ msgstr ""
msgid "User defined script to read systems IP-Address" msgid "User defined script to read systems IP-Address"
msgstr "" msgstr ""
msgid "Username"
msgstr ""
msgid "Using specific DNS Server not supported" msgid "Using specific DNS Server not supported"
msgstr "" msgstr ""
msgid "Verify"
msgstr ""
msgid "Version"
msgstr ""
msgid "Version Information" msgid "Version Information"
msgstr "" msgstr ""
msgid "Waiting for changes to be applied..."
msgstr ""
msgid "Warning"
msgstr ""
msgid "" msgid ""
"Writes detailed messages to log file. File will be truncated automatically." "Writes detailed messages to log file. File will be truncated automatically."
msgstr "" msgstr ""
@ -581,6 +503,11 @@ msgstr ""
msgid "You should install BIND host package for DNS requests." msgid "You should install BIND host package for DNS requests."
msgstr "" msgstr ""
msgid ""
"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch "
"package."
msgstr ""
msgid "You should install GNU Wget with SSL (prefered) or cURL package." msgid "You should install GNU Wget with SSL (prefered) or cURL package."
msgstr "" msgstr ""
@ -620,9 +547,6 @@ msgstr ""
msgid "file or directory not found or not 'IGNORE'" msgid "file or directory not found or not 'IGNORE'"
msgstr "" msgstr ""
msgid "help"
msgstr ""
msgid "hours" msgid "hours"
msgstr "" msgstr ""