mirror of https://github.com/aredn/aredn.git
remove trunk from urlprefix (#261)
This commit is contained in:
parent
d3b67ddbb8
commit
125f49d640
|
@ -68,7 +68,7 @@ function defaultPackageRepos(repo)
|
||||||
urlprefix = urlprefix .. "/releases/" .. a .. "/" .. b .. "/" .. release
|
urlprefix = urlprefix .. "/releases/" .. a .. "/" .. b .. "/" .. release
|
||||||
else
|
else
|
||||||
-- nightly
|
-- nightly
|
||||||
urlprefix = urlprefix .. "/snapshots/trunk"
|
urlprefix = urlprefix .. "/snapshots"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if repo:match("aredn_core") then
|
if repo:match("aredn_core") then
|
||||||
|
@ -159,7 +159,7 @@ local settings = {
|
||||||
default = defaultPackageRepos('freifunk'),
|
default = defaultPackageRepos('freifunk'),
|
||||||
postcallback = "writePackageRepo('freifunk')"
|
postcallback = "writePackageRepo('freifunk')"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
key = "aredn.@poe[0].passthrough",
|
key = "aredn.@poe[0].passthrough",
|
||||||
type = "boolean",
|
type = "boolean",
|
||||||
|
@ -177,19 +177,19 @@ local settings = {
|
||||||
condition = "hasUSB()"
|
condition = "hasUSB()"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "aredn.@tunnel[0].maxclients",
|
key = "aredn.@tunnel[0].maxclients",
|
||||||
type = "string",
|
type = "string",
|
||||||
desc = "Specifies the maximum number of tunnel clients this node can serve; must be an integer in the range [0,100]. (Only applies if tunnel software is installed)",
|
desc = "Specifies the maximum number of tunnel clients this node can serve; must be an integer in the range [0,100]. (Only applies if tunnel software is installed)",
|
||||||
default = "10",
|
default = "10",
|
||||||
condition = "hasTunnelSoftware()",
|
condition = "hasTunnelSoftware()",
|
||||||
precallback = "restrictTunnelLimitToValidRange()",
|
precallback = "restrictTunnelLimitToValidRange()",
|
||||||
postcallback = "adjustTunnelInterfaceCount()"
|
postcallback = "adjustTunnelInterfaceCount()"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key = "aredn.@tunnel[0].maxservers",
|
key = "aredn.@tunnel[0].maxservers",
|
||||||
type = "string",
|
type = "string",
|
||||||
desc = "Specifies the maximum number of tunnel servers to which this node can connect; must be an integer in the range [0,100]. (Only applies if tunnel software is installed)",
|
desc = "Specifies the maximum number of tunnel servers to which this node can connect; must be an integer in the range [0,100]. (Only applies if tunnel software is installed)",
|
||||||
default = "10",
|
default = "10",
|
||||||
condition = "hasTunnelSoftware()",
|
condition = "hasTunnelSoftware()",
|
||||||
precallback = "restrictTunnelLimitToValidRange()",
|
precallback = "restrictTunnelLimitToValidRange()",
|
||||||
postcallback = "adjustTunnelInterfaceCount()"
|
postcallback = "adjustTunnelInterfaceCount()"
|
||||||
|
@ -440,7 +440,7 @@ function adjustTunnelInterfaceCount()
|
||||||
deleteTunnelInterface("network", tunnum)
|
deleteTunnelInterface("network", tunnum)
|
||||||
end
|
end
|
||||||
-- can't clone network because it contains macros; re-edit it instead
|
-- can't clone network because it contains macros; re-edit it instead
|
||||||
os.execute("sed -i -e '$r /etc/config.mesh/network_tun' -e '/interface.*tun',$d' /etc/config.mesh/network")
|
os.execute("sed -i -e '$r /etc/config.mesh/network_tun' -e '/interface.*tun',$d' /etc/config.mesh/network")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue