Changeset 2140


Ignore:
Timestamp:
Aug 23, 2012, 12:16:49 PM (7 years ago)
Author:
matthijs
Message:

openvpn: Use the new ddns config file format.

In r2092, the DDNS package used was switched to ddns_scripts, which uses
a slightly different configuration file format. This commit fixes that,
which should cause OpenVPN to use the DDNS filename again.

References: #681, #508

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/fon/openvpn/files/usr/bin/openvpn-client.sh

    r2054 r2140  
    33NAME="FONERA"
    44PORT=`uci get openvpn.openvpn.port`
    5 HOST=`uci get ddns.ddns.dns`
     5HOST=`uci get ddns.ddns_scripts.domain`
    66[ "$HOST" = "" ] && HOST=`uci get openvpn.openvpn.public`
    77[ "$HOST" = "" ] && HOST=`uci -P /var/state/ get network.wan.ipaddr`
  • trunk/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua

    r2056 r2140  
    2929end
    3030
    31 local dns = require("luci.model.uci").cursor():get("ddns", "ddns", "dns")
     31local dns = require("luci.model.uci").cursor():get("ddns", "ddns_scripts", "domain")
    3232if not(dns) or #dns < 1 then
    3333        s:option(Value, "public", translate("public_ip", "Public IP/hostname"))
Note: See TracChangeset for help on using the changeset viewer.