From c3c5f87da208439acc394ed0ef1c2a6fe1164b3e Mon Sep 17 00:00:00 2001 From: LIN SE Date: Mon, 7 Nov 2022 10:19:06 +0100 Subject: [PATCH] fix README.md, install.py, and add flame-mag --- README.md | 2 +- install.py | 1 - servercfg/apumaster_591fac.cfg | 13 ------------- servercfg/flame-mag_591fac.cfg | 10 ++++++++++ 4 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 servercfg/apumaster_591fac.cfg create mode 100644 servercfg/flame-mag_591fac.cfg diff --git a/README.md b/README.md index 29d0711..daf88cd 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ enp1s0=wan,192.168.1.0/24 # the uplink, DHCP enabled, may be in addition in l # several networks might be specified, with comma separation # must not contain addresses defined on other interfaces! enp2s0=192.168.3.5 # the ip address of the device to be connected (DHCP or static), - # must be odd (the value one lower is used for the APU address in this interface) + # range of last number: 1..254 (the address of the APU port will be 2 or 1) enp3s0=off # disabled enp4s0=192.168.3.1/24 # our ip address, the static address of the connected device must # be within 1-254 and not match our own diff --git a/install.py b/install.py index c768edf..6f915ea 100755 --- a/install.py +++ b/install.py @@ -218,7 +218,6 @@ def create_if(name, cfg, mac, dhcp_server_cfg): cfgip = network.network_address + 2 else: cfgip = network.network_address + 1 - print(name, network.network_address, cfgip, otherip.ip) dhcp_server_cfg.append((network.with_netmask, [(str(otherip.ip), str(otherip.ip))])) result['IPADDR'] = str(cfgip) else: # subnet with multiple adresses -> static adresses only. dhcp range not yet implemented diff --git a/servercfg/apumaster_591fac.cfg b/servercfg/apumaster_591fac.cfg deleted file mode 100644 index 2f8fb28..0000000 --- a/servercfg/apumaster_591fac.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[NETWORK] -; please refer to README.md for help -enp1s0=192.168.127.1/24 -enp2s0=192.168.2.1/24 -enp3s0=192.168.3.1/24 -enp4s0=dhcp - -[ROUTER] -; please refer to README.md for help -3000=/dev/ttyUSB0 -5900=192.168.2.33 -8080=192.168.127.254:80 -3001=192.168.127.254:3001 diff --git a/servercfg/flame-mag_591fac.cfg b/servercfg/flame-mag_591fac.cfg new file mode 100644 index 0000000..b1a0dec --- /dev/null +++ b/servercfg/flame-mag_591fac.cfg @@ -0,0 +1,10 @@ +[NETWORK] +; please refer to README.md for help +enp1s0=192.168.127.254 +enp2s0=192.168.2.1 +enp3s0=192.168.3.5 +enp4s0=dhcp + +[ROUTER] +; please refer to README.md for help +5900=192.168.2.1