vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add support for static bridge IP and recovery alias

Browse source
This commit is contained in:
Alfredo Cardigliano 2020-12-03 22:30:06 +00:00
parent fa8773c969
commit fdd4305e5a
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/lua/modules/system_config/system_config.lua
View file

@ -614,6 +614,9 @@ function system_config:_writeBridgeModeNetworkConfig(f)
local mode_config = self.config.globals.available_modes["bridging"]
if ntop.isIoTBridge() then
local br_name = mode_config.name
local br_config = network_config[br_name]
package.path = dirs.installdir .. "/scripts/lua/modules/conf_handlers/?.lua;" .. package.path
local wireless = require("wireless")
-- Bridge mode on IoT bridge, setting up Wireless
@ -621,11 +624,15 @@ function system_config:_writeBridgeModeNetworkConfig(f)
-- WiFi Access Point (creates a br0)
wireless.configureWiFiAccessPoint(f,
self.config.wireless.ssid,
self.config.wireless.passphrase)
self.config.wireless.passphrase,
br_config.network)
else
wireless.disableWiFi()
end
-- Bridge interface
self:_writeNetworkInterfaceConfig(f, br_name, br_config.network, bridge_ifaces)
else
local bridge_ifaces = {}
@ -674,12 +681,16 @@ function system_config:_writeSinglePortModeInterfaces(f)
self:_writeNetworkInterfaceConfig(f, wan_iface, network_config[wan_iface].network)
end
function system_config:_getRecoveryInterface()
return self:getLanInterface() .. ":2"
end
function system_config:_writeNetworkInterfaces()
local mode = self:getOperatingMode()
local f = self.conf_handler.openNetworkInterfacesConfigFile()
local recovery_conf = self:getLanRecoveryIpConfig()
local recovery_iface = self:getLanInterface() .. ":2"
local recovery_iface = self:_getRecoveryInterface()
local is_configured, fnames = self.conf_handler.isConfiguredInterface("lo")
if not is_configured then
@ -698,9 +709,7 @@ function system_config:_writeNetworkInterfaces()
end
-- Configure backup interface
if not ntop.isIoTBridge() then
self:_writeNetworkInterfaceConfig(f, recovery_iface, { mode="static", ip=recovery_conf.ip, netmask=recovery_conf.netmask })
end
self:_writeNetworkInterfaceConfig(f, recovery_iface, { mode="static", ip=recovery_conf.ip, netmask=recovery_conf.netmask })
self.conf_handler.closeNetworkInterfacesConfigFile(f)
end