From 51b203293dcb72f0c479a785678c0f2167015d9e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 9 Feb 2024 10:29:17 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Updated=20Router=20Config=20at?= =?UTF-8?q?=20Fri=20Feb=20=209=2010:29:17=20EST=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- os/routers/glmain/gen-mappings.py | 10 +++- os/routers/glmain/output/etc/dnsmasq.conf | 16 ------- os/routers/glmain/output/etc/ethers | 58 +++++++++++++++++++++++ os/routers/glmain/push.sh | 3 +- 4 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 os/routers/glmain/output/etc/ethers diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index 80418e2..fa8cab8 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -8,10 +8,12 @@ BASE_PATH = Path(__file__).parent CONFIG_FILE = BASE_PATH / "config.yaml" OUTPUT_FOLDER = BASE_PATH / "output" DNSMASQ_CONF = OUTPUT_FOLDER / "etc/dnsmasq.conf" +ETHERS = OUTPUT_FOLDER / "etc/ethers" SUMMARY = OUTPUT_FOLDER / "summary.yaml" shutil.rmtree(OUTPUT_FOLDER) DNSMASQ_CONF.parent.mkdir(exist_ok=True, parents=True) +ETHERS.parent.mkdir(exist_ok=True, parents=True) root_domain = "internal" ip_prefix_map = { @@ -33,10 +35,11 @@ def cap1_and_join(*args: str) -> str: with CONFIG_FILE.open('r') as fp: devices = yaml.safe_load(fp) -with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp: +with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp, ETHERS.open('w') as efp: for sub_domain, configs in devices.items(): ip_prefix = ip_prefix_map[sub_domain] sfp.write(f'\n{cap1_and_join(sub_domain)}:') + efp.write(f'#{cap1_and_join(sub_domain)}\n') for ip_suffix, dvc in enumerate(configs, start=1): mac = dvc['mac'] name = dvc['name'] @@ -47,7 +50,10 @@ with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp: sfp.write(f'\n host: "{host}"') dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") dfp.write(f"address=/{host}/{ip}\n") + efp.write(f'{mac} {ip}\n') + efp.write(f'{mac} {host}\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}"') \ No newline at end of file + sfp.write(f'\n domain: "{domain}"') + efp.write(f'{mac} {domain}\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 98ee9a2..edf142c 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -38,19 +38,3 @@ dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite address=/korie-lamp.iot.internal/10.0.14.1 -dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite -address=/office-strip.iot.internal/10.0.14.2 -dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite -address=/ecobee.iot.internal/10.0.14.3 -dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite -address=/apollo-eddie.iot.internal/10.0.14.4 -dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite -address=/apollo-office.iot.internal/10.0.14.5 -dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite -address=/apollo-laundry.iot.internal/10.0.14.6 -dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite -address=/epl-kitchen.iot.internal/10.0.14.7 -dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite -address=/epl-livingroom.iot.internal/10.0.14.8 -dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite -address=/hp-print.apl.internal/10.0.15.1 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers new file mode 100644 index 0000000..562885e --- /dev/null +++ b/os/routers/glmain/output/etc/ethers @@ -0,0 +1,58 @@ +#Lab +3C:7C:3F:1E:B7:A0 10.0.10.1 +3C:7C:3F:1E:B7:A0 tnas1.lab.internal +3C:7C:3F:1E:B7:A0 tnas1.lab.local +00:A0:98:3D:7C:C8 10.0.10.2 +00:A0:98:3D:7C:C8 kubedb.lab.internal +B8:27:EB:F7:44:4E 10.0.10.3 +B8:27:EB:F7:44:4E pi1.lab.internal +9C:BF:0D:00:56:51 10.0.10.4 +9C:BF:0D:00:56:51 fws1.lab.internal +#K3s +7C:83:34:B8:7B:43 10.0.11.1 +7C:83:34:B8:7B:43 bee1.k3s.internal +7C:83:34:B8:7B:43 home.sosnovsky.ca +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 +E4:5F:01:A2:8D:BC castle.home.sosnovsky.ca +DC:A6:32:92:B2:79 10.0.12.2 +DC:A6:32:92:B2:79 basement.hub.internal +DC:A6:32:92:B2:79 basement.home.sosnovsky.ca +4E:F6:9C:7C:56:33 10.0.12.3 +4E:F6:9C:7C:56:33 flic.hub.internal +#Cam +9C:8E:CD:25:83:1F 10.0.13.1 +9C:8E:CD:25:83:1F korie.cam.internal +A0:60:32:03:86:8A 10.0.13.2 +A0:60:32:03:86:8A eddie.cam.internal +48:9E:9D:4A:32:80 10.0.13.3 +48:9E:9D:4A:32:80 doorbell.cam.internal +34:60:F9:D7:51:3F 10.0.13.4 +34:60:F9:D7:51:3F livingroom.cam.internal +#Iot +60:74:F4:4D:B8:C5 10.0.14.1 +60:74:F4:4D:B8:C5 korie-lamp.iot.internal +DC:4F:22:24:0C:E4 10.0.14.2 +DC:4F:22:24:0C:E4 office-strip.iot.internal +44:61:32:FC:10:EC 10.0.14.3 +44:61:32:FC:10:EC ecobee.iot.internal +30:30:F9:DC:A8:18 10.0.14.4 +30:30:F9:DC:A8:18 apollo-eddie.iot.internal +30:30:F9:DA:C7:A4 10.0.14.5 +30:30:F9:DA:C7:A4 apollo-office.iot.internal +30:30:F9:DC:BE:7C 10.0.14.6 +30:30:F9:DC:BE:7C apollo-laundry.iot.internal +64:B7:08:28:52:50 10.0.14.7 +64:B7:08:28:52:50 epl-kitchen.iot.internal +64:B7:08:28:56:F4 10.0.14.8 +64:B7:08:28:56:F4 epl-livingroom.iot.internal +#Apl +48:9E:BD:CB:07:E3 10.0.15.1 +48:9E:BD:CB:07:E3 hp-print.apl.internal diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index 24665be..f03c65f 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -26,11 +26,12 @@ echo "using 🤖 $server" ask "continue update" echo "Updating conf..." -./gen-mappings.py +# ./gen-mappings.py cat output/summary.yaml ask "continue update" scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +scp -O output/etc/ethers "$server:/etc/ethers" ssh "$server" << EOF echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf