From bc882262b6a110434af2e3e7e88d2e379f34aa2c Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Tue, 6 Feb 2024 11:45:44 -0500 Subject: [PATCH] latest work --- os/routers/glmain/config.yaml | 39 ++++++++ os/routers/glmain/devices.yaml | 23 ----- os/routers/glmain/dhcp-mapping | 105 ---------------------- os/routers/glmain/etc-hosts | 16 ---- os/routers/glmain/gen-mappings.py | 36 ++++++++ os/routers/glmain/output/var/dnsmasq.conf | 40 +++++++++ 6 files changed, 115 insertions(+), 144 deletions(-) create mode 100644 os/routers/glmain/config.yaml delete mode 100644 os/routers/glmain/devices.yaml delete mode 100644 os/routers/glmain/dhcp-mapping delete mode 100644 os/routers/glmain/etc-hosts create mode 100755 os/routers/glmain/gen-mappings.py create mode 100644 os/routers/glmain/output/var/dnsmasq.conf diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml new file mode 100644 index 0000000..5574823 --- /dev/null +++ b/os/routers/glmain/config.yaml @@ -0,0 +1,39 @@ +lab: + - mac: '3C:7C:3F:1E:B7:A0' + name: 'tnascore1' + - mac: '00:A0:98:3D:7C:C8' + name: 'kubedb' + - mac: 'B8:27:EB:F7:44:4E' + name: 'pi1' + - mac: '9C:BF:0D:00:56:51' + name: 'fws1' +k3s: + - mac: '7C:83:34:B8:7B:43' + name: 'bee1' + domain: home.sosnovsky.ca + - mac: '68:1D:EF:26:B7:6C' + name: 'terry1' + domain: home.sosnovsky.ca + - mac: '58:47:CA:71:D8:E6' + name: 'minisf1' + domain: home.sosnovsky.ca + - mac: '00:A0:98:17:B2:64' + name: 'tnas1' +hub: + - mac: 'E4:5F:01:A2:8D:BC' + name: 'castle' + domain: castle.home.sosnovsky.ca + - mac: 'DC:A6:32:92:B2:79' + name: 'basement' + domain: basement.home.sosnovsky.ca + - mac: '4E:F6:9C:7C:56:33' + name: 'flic' +cam: + - name: 'korie' + mac: '01:9c:8e:cd:25:83:1f' + - name: 'eddie' + mac: '01:a0:60:32:03:86:8a' + - name: 'doorbell' + mac: '01:48:9e:9d:4a:32:80' + - name: 'livingroom' + mac: '34:60:F9:D7:51:3F' \ No newline at end of file diff --git a/os/routers/glmain/devices.yaml b/os/routers/glmain/devices.yaml deleted file mode 100644 index d4ffa38..0000000 --- a/os/routers/glmain/devices.yaml +++ /dev/null @@ -1,23 +0,0 @@ -lab: - - mac: '3C:7C:3F:1E:B7:A0' - name: 'tnascore1' - - mac: '00:A0:98:3D:7C:C8' - name: 'kubedb' - - mac: 'B8:27:EB:F7:44:4E' - name: 'pi1' -k3s: - - mac: '7C:83:34:B8:7B:43' - name: 'bee1' - - mac: '68:1D:EF:26:B7:6C' - name: 'terry1' - - mac: '58:47:CA:71:D8:E6' - name: 'minisf1' - - mac: '00:A0:98:17:B2:64' - name: 'tnas1' -hub: - - mac: 'E4:5F:01:A2:8D:BC' - name: 'castle' - - mac: 'DC:A6:32:92:B2:79' - name: 'basement' - - mac: '4E:F6:9C:7C:56:33' - name: 'flic' \ No newline at end of file diff --git a/os/routers/glmain/dhcp-mapping b/os/routers/glmain/dhcp-mapping deleted file mode 100644 index 40cf4c0..0000000 --- a/os/routers/glmain/dhcp-mapping +++ /dev/null @@ -1,105 +0,0 @@ -config dnsmasq - option domainneeded '1' - option filterwin2k '0' - option localise_queries '1' - option rebind_localhost '1' - option local '/lan/' - option domain 'lan' - option expandhosts '1' - option nonegcache '0' - option authoritative '1' - option readethers '1' - option leasefile '/tmp/dhcp.leases' - option resolvfile '/tmp/resolv.conf.d/resolv.conf.auto' - option nonwildcard '1' - option localservice '1' - option ednspacket_max '1232' - option rebind_protection '0' - -config dhcp 'lan' - option interface 'lan' - option start '100' - option limit '150' - option dhcpv4 'server' - option ra_slaac '1' - option force '1' - option dhcpv6 'disabled' - option ra 'disabled' - option leasetime '720m' - option ignore '0' - -config dhcp 'wan' - option interface 'wan' - option ignore '1' - -config odhcpd 'odhcpd' - option maindhcp '0' - option leasefile '/tmp/hosts/odhcpd' - option leasetrigger '/usr/sbin/odhcpd-update' - option loglevel '4' - -config domain - option name 'console.gl-inet.com' - option ip '10.0.0.2' - -config domain - option name 'console.gl-inet.com' - option ip '::ffff:10.0.0.2' - -config dhcp 'guest' - option interface 'guest' - option start '100' - option limit '150' - option leasetime '12h' - option dhcpv6 'disabled' - option ra 'disabled' - -config host - option mac '3C:7C:3F:1E:B7:A0' - option ip '10.0.10.1' - option tag 'LabTrueNas1' - -config host - option mac '7C:83:34:B8:7B:43' - option ip '10.0.10.2' - option tag 'LabK3sbee1' - -config host - option mac '00:A0:98:3D:7C:C8' - option ip '10.0.10.3' - option tag 'LabKubedb' - -config host - option mac 'B8:27:EB:F7:44:4E' - option ip '10.0.10.4' - option tag 'LabPi1' - -config host - option mac 'E4:5F:01:A2:8D:BC' - option ip '10.0.11.1' - option tag 'HubCastle' - -config host - option mac 'DC:A6:32:92:B2:79' - option ip '10.0.11.2' - option tag 'HubBasement' - -config host - option mac '68:1D:EF:26:B7:6C' - option ip '10.0.10.5' - option tag 'LabTerry1' - -config host - option mac '58:47:CA:71:D8:E6' - option ip '10.0.10.6' - option tag 'LabMinisf1' - -config host - option mac '00:A0:98:17:B2:64' - option ip '10.0.10.7' - option tag 'LabTruenas2' - -config host - option mac '4E:F6:9C:7C:56:33' - option ip '10.0.11.3' - option tag 'HubFlic' \ No newline at end of file diff --git a/os/routers/glmain/etc-hosts b/os/routers/glmain/etc-hosts deleted file mode 100644 index 1ced0d6..0000000 --- a/os/routers/glmain/etc-hosts +++ /dev/null @@ -1,16 +0,0 @@ -127.0.0.1 localhost - -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -10.0.0.1 gl.router.internal -10.0.10.1 tnas1.lab.internal -10.0.10.2 bee1.lab.internal -10.0.10.3 kubedb.lab.internal -10.0.10.4 pi1.lab.internal -10.0.10.5 terry1.lab.internal -10.0.10.6 minisf1.lab.internal -10.0.10.7 tnas2.lab.internal -10.0.11.1 castle.hub.internal castle.home.sosnovsky.ca -10.0.11.2 basement.hub.internal -10.0.11.3 flic.hub.internal diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py new file mode 100755 index 0000000..fba03c7 --- /dev/null +++ b/os/routers/glmain/gen-mappings.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +from pathlib import Path + +import yaml + +BASE_PATH = Path(__file__).parent +CONFIG_FILE = BASE_PATH / "config.yaml" +OUTPUT_FOLDER = BASE_PATH / "output" +DNSMASQ_CONF = OUTPUT_FOLDER / "var" / "dnsmasq.conf" + +DNSMASQ_CONF.parent.mkdir(exist_ok=True, parents=True) + +root_domain = "internal" +ip_prefix_map = { + "lab": "10.0.10.", + "k3s": "10.0.11.", + "hub": "10.0.12.", + "cam": "10.0.13.", +} + +with CONFIG_FILE.open('r') as fp: + devices = yaml.safe_load(fp) + +with DNSMASQ_CONF.open('w') as fp: + for sub_domain, configs in devices.items(): + ip_prefix = ip_prefix_map[sub_domain] + for ip_suffix, dvc in enumerate(configs, start=1): + mac = dvc['mac'] + name = dvc['name'] + ip = f"{ip_prefix}{ip_suffix}" + host = f"{name}.{sub_domain}.{root_domain}" + fp.write(f"dhcp-host={mac},{name}{sub_domain},{ip},infinite\n") + fp.write(f"address=/{host}/{ip}\n") + if domain := dvc.get('domain'): + fp.write(f"address=/{domain}/{ip}\n") + fp.write(f"address=/.{domain}/{ip}\n") diff --git a/os/routers/glmain/output/var/dnsmasq.conf b/os/routers/glmain/output/var/dnsmasq.conf new file mode 100644 index 0000000..51ff2ab --- /dev/null +++ b/os/routers/glmain/output/var/dnsmasq.conf @@ -0,0 +1,40 @@ +dhcp-host=3C:7C:3F:1E:B7:A0,tnascore1lab,10.0.10.1,infinite +address=/tnascore1.lab.internal/10.0.10.1 +dhcp-host=00:A0:98:3D:7C:C8,kubedblab,10.0.10.2,infinite +address=/kubedb.lab.internal/10.0.10.2 +dhcp-host=B8:27:EB:F7:44:4E,pi1lab,10.0.10.3,infinite +address=/pi1.lab.internal/10.0.10.3 +dhcp-host=9C:BF:0D:00:56:51,fws1lab,10.0.10.4,infinite +address=/fws1.lab.internal/10.0.10.4 +dhcp-host=7C:83:34:B8:7B:43,bee1k3s,10.0.11.1,infinite +address=/bee1.k3s.internal/10.0.11.1 +address=/home.sosnovsky.ca/10.0.11.1 +address=/.home.sosnovsky.ca/10.0.11.1 +dhcp-host=68:1D:EF:26:B7:6C,terry1k3s,10.0.11.2,infinite +address=/terry1.k3s.internal/10.0.11.2 +address=/home.sosnovsky.ca/10.0.11.2 +address=/.home.sosnovsky.ca/10.0.11.2 +dhcp-host=58:47:CA:71:D8:E6,minisf1k3s,10.0.11.3,infinite +address=/minisf1.k3s.internal/10.0.11.3 +address=/home.sosnovsky.ca/10.0.11.3 +address=/.home.sosnovsky.ca/10.0.11.3 +dhcp-host=00:A0:98:17:B2:64,tnas1k3s,10.0.11.4,infinite +address=/tnas1.k3s.internal/10.0.11.4 +dhcp-host=E4:5F:01:A2:8D:BC,castlehub,10.0.12.1,infinite +address=/castle.hub.internal/10.0.12.1 +address=/castle.home.sosnovsky.ca/10.0.12.1 +address=/.castle.home.sosnovsky.ca/10.0.12.1 +dhcp-host=DC:A6:32:92:B2:79,basementhub,10.0.12.2,infinite +address=/basement.hub.internal/10.0.12.2 +address=/basement.home.sosnovsky.ca/10.0.12.2 +address=/.basement.home.sosnovsky.ca/10.0.12.2 +dhcp-host=4E:F6:9C:7C:56:33,flichub,10.0.12.3,infinite +address=/flic.hub.internal/10.0.12.3 +dhcp-host=01:9c:8e:cd:25:83:1f,koriecam,10.0.13.1,infinite +address=/korie.cam.internal/10.0.13.1 +dhcp-host=01:a0:60:32:03:86:8a,eddiecam,10.0.13.2,infinite +address=/eddie.cam.internal/10.0.13.2 +dhcp-host=01:48:9e:9d:4a:32:80,doorbellcam,10.0.13.3,infinite +address=/doorbell.cam.internal/10.0.13.3 +dhcp-host=34:60:F9:D7:51:3F,livingroomcam,10.0.13.4,infinite +address=/livingroom.cam.internal/10.0.13.4