diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 0b82658..6e314b2 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -11,17 +11,15 @@ lab: - mac: '74:56:3C:CA:E2:ED' name: 'bigbox1' domain: compute.internal -k3s: - - mac: '7C:83:34:B8:7B:43' - name: 'bee1' - domain: k3sapp.internal - mac: '68:1D:EF:26:B7:6C' - name: 'terry1' + name: 'minipc1' + - mac: '7C:83:34:B8:7B:43' + name: 'minipc2' +k3s: - mac: '58:47:CA:71:D8:E6' + id: 3 name: 'minisf1' - domain: home.sosnovsky.ca - - mac: '00:A0:98:17:B2:64' - name: 'tnas1' + domain: home.sosnovsky.ca,k3sapp.internal hub: - mac: 'E4:5F:01:A2:8D:BC' name: 'castle' diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index 88bb200..07f4cdd 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -50,7 +50,10 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') a efp.write(f'#{cap1_and_join(sub_domain)}\n') ip_suffix = 0 for dvc in configs: - ip_suffix += 1 + if dvc.get('id'): + ip_suffix = dvc.get('id') + else: + ip_suffix += 1 dvc = {**default_values, **dvc} mac = dvc['mac'] name = dvc['name'] @@ -62,8 +65,9 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') a sfp.write(f'\n host: "{host}"') if not dvc.get('justMac', False): efp.write(f'{mac} {ip}\n') - if domain := dvc.get('domain'): - dfp.write(f"address=/{domain}/{ip}\n") - dfp.write(f"address=/.{domain}/{ip}\n") - sfp.write(f'\n domain: "{domain}"') + if domains := dvc.get('domain'): + for domain in domains.split(','): + dfp.write(f"address=/{domain}/{ip}\n") + dfp.write(f"address=/.{domain}/{ip}\n") + sfp.write(f'\n domain: "{domains}"') efp.write(f'{mac} {host}\n') \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index 41d4933..f7be434 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -2,10 +2,10 @@ address=/tnas1.lab.local/10.0.10.1 address=/.tnas1.lab.local/10.0.10.1 address=/compute.internal/10.0.10.5 address=/.compute.internal/10.0.10.5 -address=/k3sapp.internal/10.0.11.1 -address=/.k3sapp.internal/10.0.11.1 address=/home.sosnovsky.ca/10.0.11.3 address=/.home.sosnovsky.ca/10.0.11.3 +address=/k3sapp.internal/10.0.11.3 +address=/.k3sapp.internal/10.0.11.3 address=/castle.home.sosnovsky.ca/10.0.12.1 address=/.castle.home.sosnovsky.ca/10.0.12.1 address=/basement.home.sosnovsky.ca/10.0.12.2 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index acdceca..f57a38e 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -9,15 +9,13 @@ B8:27:EB:F7:44:4E pi1.lab.internal 9C:BF:0D:00:56:51 fws1.lab.internal 74:56:3C:CA:E2:ED 10.0.10.5 74:56:3C:CA:E2:ED bigbox1.lab.internal +68:1D:EF:26:B7:6C 10.0.10.6 +68:1D:EF:26:B7:6C minipc1.lab.internal +7C:83:34:B8:7B:43 10.0.10.7 +7C:83:34:B8:7B:43 minipc2.lab.internal #K3s -7C:83:34:B8:7B:43 10.0.11.1 -7C:83:34:B8:7B:43 bee1.k3s.internal -68:1D:EF:26:B7:6C 10.0.11.2 -68:1D:EF:26:B7:6C terry1.k3s.internal 58:47:CA:71:D8:E6 10.0.11.3 58:47:CA:71:D8:E6 minisf1.k3s.internal -00:A0:98:17:B2:64 10.0.11.4 -00:A0:98:17:B2:64 tnas1.k3s.internal #Hub E4:5F:01:A2:8D:BC 10.0.12.1 E4:5F:01:A2:8D:BC castle.hub.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index ab4345b..b995ce0 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -17,21 +17,17 @@ Lab: ip: "10.0.10.5" host: "bigbox1.lab.internal" domain: "compute.internal" + Minipc1: + ip: "10.0.10.6" + host: "minipc1.lab.internal" + Minipc2: + ip: "10.0.10.7" + host: "minipc2.lab.internal" K3s: - Bee1: - ip: "10.0.11.1" - host: "bee1.k3s.internal" - domain: "k3sapp.internal" - Terry1: - ip: "10.0.11.2" - host: "terry1.k3s.internal" Minisf1: ip: "10.0.11.3" host: "minisf1.k3s.internal" - domain: "home.sosnovsky.ca" - Tnas1: - ip: "10.0.11.4" - host: "tnas1.k3s.internal" + domain: "home.sosnovsky.ca,k3sapp.internal" Hub: Castle: ip: "10.0.12.1"