Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve and simplify WAN config (#1539) 

* Simplify WAN enable/disable

* Improve
This commit is contained in:
Tim Wilkinson 2024-09-18 19:31:05 -07:00 committed by GitHub
parent 83e852044e
commit 752dfc514b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
files/app/main/status/e/network.ut
View File

@ -108,16 +108,11 @@ if (request.env.REQUEST_METHOD === "PUT") {
configuration.setSetting("dhcp_end", request.args.lan_dhcp_end); configuration.setSetting("dhcp_end", request.args.lan_dhcp_end);
} }
} }
if ("wan_enable" in request.args) {
if (request.args.wan_enable === "off") {
configuration.setSetting("wan_proto", "disabled");
}
else {
configuration.setSetting("wan_proto", "dhcp");
}
}
if ("wan_mode" in request.args) { if ("wan_mode" in request.args) {
if (request.args.wan_mode === "0") { if (request.args.wan_mode === "0") {
configuration.setSetting("wan_proto", "disabled");
}
else if (request.args.wan_mode === "1") {
configuration.setSetting("wan_proto", "dhcp"); configuration.setSetting("wan_proto", "dhcp");
} }
else { else {
@ -299,63 +294,52 @@ const gateway_altnet = dmz_mode === 1 ? dhcp.gateway : "";
</div> </div>
</div> </div>
<hr> <hr>
<div class="hideable" data-hideable='{{wan_proto === "disabled" ? "off" : "on"}}'> <div class="compact hideable" data-hideable='{{wan_proto === "static" ? 2 : wan_proto === "dhcp" ? 1 : 0}}'>
<div class="cols"> <div class="cols">
<div> <div>
<div class="o">WAN Enable</div> <div class="o">WAN Mode</div>
<div class="m">Allow node to directly access the Internet</div> <div class="m">Disabled, static or DHCP mode</div>
</div> </div>
<div style="flex:0"> <div style="flex:0">
{{_R("hideable-switch", { name: "wan_enable", value: wan_proto === "disabled" ? false : true })}} <select hx-put="{{request.env.REQUEST_URI}}" hx-swap="none" name="wan_mode" {{_R("hideable-onselect")}}>
<option value="0" {{wan_proto === "disabled" ? "selected" : ""}}>Disabled</option>
<option value="1" {{wan_proto === "dhcp" ? "selected" : ""}}>DHCP</option>
<option value="2" {{wan_proto === "static" ? "selected" : ""}}>Static</option>
</select>
</div> </div>
</div> </div>
{{_H("Enable the WAN interface on this node, to allow it to access the Internet directly.")}} {{_H("The WAN interface can either use DHCP to retrieve an IP address, or it can be set statically.")}}
<div class="compact hideable hideable0" data-hideable='{{wan_proto === "static" ? 1 : 0}}'> <div class="hideable2">
<div class="cols"> <div class="cols">
<div> <div>
<div class="o">Mode</div> <div class="o">A&zwnj;ddress</div>
<div class="m">Static or DHCP mode</div> <div class="m">WAN IP a&zwnj;ddress</div>
</div> </div>
<div style="flex:0"> <div style="flex:0">
<select hx-put="{{request.env.REQUEST_URI}}" hx-swap="none" name="wan_mode" {{_R("hideable-onselect")}}> <input hx-put="{{request.env.REQUEST_URI}}" name="wan_ip" type="text" size="15" pattern="{{constants.patIP}}" required value="{{configuration.getSettingAsString("wan_ip")}}">
<option value="0" {{wan_proto !== "static" ? "selected" : ""}}>DHCP</option>
<option value="1" {{wan_proto === "static" ? "selected" : ""}}>Static</option>
</select>
</div> </div>
</div> </div>
{{_H("The WAN interface can either use DHCP to retrieve an IP address, or it can be set statically.")}} {{_H("A fixed IP address to assign to the WAN interace on this node.")}}
<div class="hideable1"> <div class="cols">
<div class="cols"> <div>
<div> <div class="o">Netmask</div>
<div class="o">A&zwnj;ddress</div> <div class="m">WAN netmask</div>
<div class="m">WAN IP a&zwnj;ddress</div>
</div>
<div style="flex:0">
<input hx-put="{{request.env.REQUEST_URI}}" name="wan_ip" type="text" size="15" pattern="{{constants.patIP}}" required value="{{configuration.getSettingAsString("wan_ip")}}">
</div>
</div> </div>
{{_H("A fixed IP address to assign to the WAN interace on this node.")}} <div style="flex:0">
<div class="cols"> <input hx-put="{{request.env.REQUEST_URI}}" name="wan_mask" type="text" size="15" pattern="(((255\.){3}(255|254|252|248|240|224|192|128|0+))|((255\.){2}(255|254|252|248|240|224|192|128|0+)\.0)|((255\.)(255|254|252|248|240|224|192|128|0+)(\.0+){2})|((255|254|252|248|240|224|192|128|0+)(\.0+){3}))" required value="{{configuration.getSettingAsString("wan_mask")}}">
<div>
<div class="o">Netmask</div>
<div class="m">WAN netmask</div>
</div>
<div style="flex:0">
<input hx-put="{{request.env.REQUEST_URI}}" name="wan_mask" type="text" size="15" pattern="(((255\.){3}(255|254|252|248|240|224|192|128|0+))|((255\.){2}(255|254|252|248|240|224|192|128|0+)\.0)|((255\.)(255|254|252|248|240|224|192|128|0+)(\.0+){2})|((255|254|252|248|240|224|192|128|0+)(\.0+){3}))" required value="{{configuration.getSettingAsString("wan_mask")}}">
</div>
</div> </div>
{{_H("The netmask (e.g. 255.255.255.0) for this interface.")}}
<div class="cols">
<div>
<div class="o">Gateway</div>
<div class="m">Default gateway</div>
</div>
<div style="flex:0">
<input hx-put="{{request.env.REQUEST_URI}}" name="wan_gw" type="text" size="15" pattern="{{constants.patIP}}" required value="{{configuration.getSettingAsString("wan_gw")}}">
</div>
</div>
{{_H("The default gateway his node should use to access the Internet.")}}
</div> </div>
{{_H("The netmask (e.g. 255.255.255.0) for this interface.")}}
<div class="cols">
<div>
<div class="o">Gateway</div>
<div class="m">Default gateway</div>
</div>
<div style="flex:0">
<input hx-put="{{request.env.REQUEST_URI}}" name="wan_gw" type="text" size="15" pattern="{{constants.patIP}}" required value="{{configuration.getSettingAsString("wan_gw")}}">
</div>
</div>
{{_H("The default gateway his node should use to access the Internet.")}}
</div> </div>
</div> </div>
<hr> <hr>

2
files/usr/local/bin/node-setup
View File

@ -237,7 +237,7 @@ end
-- delete some config lines if necessary -- delete some config lines if necessary
if cfg.wan_proto == "dhcp" then if cfg.wan_proto ~= "static" then
deleteme.wan_ip = true deleteme.wan_ip = true
deleteme.wan_gw = true deleteme.wan_gw = true
deleteme.wan_mask = true deleteme.wan_mask = true