Mercurial > code > home > repos > infra
changeset 65:49a69852a4f4
let's get in less trouble by using dhcp more universally
| author | drewp@bigasterisk.com |
|---|---|
| date | Wed, 04 May 2022 23:37:27 -0700 |
| parents | 32b32ee2211a |
| children | 5ad4b4c712d9 |
| files | dns.py net.py templates/dnsmasq/dhcp_hosts.j2 templates/dnsmasq/dnsmasq.conf.j2 templates/net/singlenic.network.j2 |
| diffstat | 5 files changed, 13 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/dns.py Wed May 04 23:36:13 2022 -0700 +++ b/dns.py Wed May 04 23:37:27 2022 -0700 @@ -23,7 +23,7 @@ dhcp_hosts = tempfile.NamedTemporaryFile(mode='wt', encoding='ascii') dhcp_hosts.write("# written by pyinfra\n\n") for row in lanscape_config['dhcp_table']: - dhcp_hosts.write(f'{row["mac"]},{row["hostname"]},{row["ip"]},infinite\n') + dhcp_hosts.write(f'{row["mac"]},{row["hostname"]},{row["ip"]},24h\n') dhcp_hosts.flush() return dhcp_hosts
--- a/net.py Wed May 04 23:36:13 2022 -0700 +++ b/net.py Wed May 04 23:37:27 2022 -0700 @@ -61,16 +61,15 @@ if is_wifi: files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") - addr = host.host_data['addr'] - net = addr[:4] - gateway = net + '.0.1' - dns = gateway + # addr = host.host_data['addr'] + # net = addr[:4] + # gateway = net + '.0.1' + # dns = gateway - files.template(src="templates/net/singlenic.network.j2", - dest="/etc/systemd/network/99-bigasterisk.network", - create_remote_dir=True, - mac=host.host_data['mac'], - addr=addr, - gateway=gateway, - dns=dns) + files.template( + src="templates/net/singlenic.network.j2", + dest="/etc/systemd/network/99-bigasterisk.network", + create_remote_dir=True, + mac=host.host_data['mac'], + ) systemd.service(service='systemd-networkd.service', running=True, restarted=True)
--- a/templates/dnsmasq/dhcp_hosts.j2 Wed May 04 23:36:13 2022 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -this is old; see /my/serv/lanscape/netdevices.n3 - -b8:97:5a:17:d7:1f,dash,10.2.0.77,infinite -c8:60:00:98:ec:74,slash,10.2.0.138,infinite -7c:c3:a1:b0:83:03,kelsi-imac,10.2.0.7,infinite -1c:c1:de:56:e6:70,music,10.2.0.8,infinite - -a0:40:a0:6f:96:d5,orbi,10.2.0.5,infinite -a0:40:a0:6f:aa:f8,orbi-sat1,10.2.0.6,infinite -8c:3b:ad:c4:8d:ce,orbi-sat2,10.2.0.7,infinite - -# 00:0f:54:13:36:d2,prevkitchen,10.2.0.10,infinite -b8:27:eb:d9:86:22,kitchen,10.2.0.10,infinite -b8:27:eb:00:26:92,living,10.2.0.11,infinite -b8:27:eb:6d:2b:6f,workshop,10.2.0.13,infinite -b8:27:eb:81:17:92,garage,10.2.0.14,infinite -b8:27:eb:86:28:02,bed,10.2.0.15,infinite -b8:27:eb:d6:15:72,changing,10.2.0.16,infinite -b8:27:eb:e9:d3:44,frontbed,10.2.0.17,infinite -b8:27:eb:83:40:27,changing-wifi,10.2.0.18,infinite -b8:27:eb:d4:42:c7,garage-wifi,10.2.0.19,infinite - -# pi4 # dc:a6:32:00:d1:de,frontdoor,10.2.0.12,infinite -b8:27:eb:6a:41:e3,frontdoor,10.2.0.12,infinite - -1c:c1:de:56:e6:70,dot,10.2.0.30,infinite -7c:c3:a1:b0:83:03,kelsi-imac,10.2.0.31,infinite - -78:11:dc:44:4a:48,gardencam,10.2.0.40,infinite -78:11:dc:78:00:8d,ashercam,10.2.0.41,infinite -34:ce:00:e4:a4:11,livingcam,10.2.0.42,infinite -78:11:dc:78:39:31,twinscam,10.2.0.43,infinite -24:62:ab:f8:6f:20,office_back_cam,10.2.0.44,infinite -#...,garage_hall_cam,10.2.0.45,infinite - - -94:9f:3e:7e:7d:b4,sonos-bed,10.2.0.50,infinite -# skip .51 for old lease -94:9f:3e:7b:45:a8,sonos-kitchen,10.2.0.52,infinite - -30:fd:38:79:2f:48,googlehome-ari,10.2.0.60,infinite -38:8b:59:5b:63:5f,googlehome-bed,10.2.0.61,infinite -48:d6:d5:75:f5:7b,googlehome-asher,10.2.0.62,infinite - -30:fd:38:8b:98:c0,chromecast1,10.2.0.70,infinite -cc:08:8d:e9:60:65,chromecast2,10.2.0.71,infinite -6c:ad:f8:1b:c5:31,chromecast3,10.2.0.72,infinite - -a0:cc:2b:f5:a2:21,tradfri,10.2.0.80,infinite -d8:d5:b9:00:2c:41,powereagle,10.2.0.81,infinite - -3c:71:bf:8c:49:c4,cabin,10.2.0.90,infinite -80:7d:3a:33:bd:72,kitchen-counter-lights,10.2.0.91,infinite -dc:4f:22:4b:d9:65,kitchen-ceiling-lights,10.2.0.92,infinite -24:0a:c4:9b:cb:c8,frontdoorlock,10.2.0.93,infinite -18:fe:34:a6:04:31,greenhouse,10.2.0.94,infinite -5c:cf:7f:01:58:8a,ridecontrol,10.2.0.95,infinite -a0:20:a6:0a:87:a8,nightlight_ari,10.2.0.96,infinite -84:f3:eb:e3:a7:84,nightlight_display1,10.2.0.97,infinite -a0:20:a6:0b:9e:68,bed_bar_asher,10.2.0.98,infinite - -9c:b6:d0:1d:d1:03,plus,10.2.0.110,infinite -#6c:19:c0:70:7e:98,unknown -48:60:5f:69:1a:e6,drew-work-phone,10.2.0.111,infinite -dc:ef:ca:ed:58:27,drew-note8,10.2.0.112,infinite -fc:db:b3:ff:f3:d1,drew-note5,10.2.0.113,infinite -38:8b:59:5b:63:5f,kelsi-ipad,10.2.0.114,infinite -68:ab:1e:38:14:ed,kelsi-watch,10.2.0.115,infinite -7c:c3:a1:b0:83:03,kelsi-imac-wifi,10.2.0.116,infinite -7c:b0:c2:83:31:0f,ari-chromebook,10.2.0.117,infinite -b0:19:c6:79:ef:55,daniele-phone,10.2.0.118,infinite -e8:f2:e2:83:cc:c0,pf1500-projector,10.2.0.119,infinite
--- a/templates/dnsmasq/dnsmasq.conf.j2 Wed May 04 23:36:13 2022 -0700 +++ b/templates/dnsmasq/dnsmasq.conf.j2 Wed May 04 23:37:27 2022 -0700 @@ -35,7 +35,7 @@ dhcp-hostsfile=/opt/dnsmasq/{{ net }}/dhcp_hosts dhcp-leasefile=/opt/dnsmasq/{{ net }}/leases dhcp-range=ens5,10.2.0.0,static,infinite -dhcp-range=tag:!known,ens5,10.2.0.125,10.2.0.200,24h +dhcp-range=tag:!known,ens5,10.2.0.125,10.2.0.220,24h dhcp-option=ens5,option:dns-server,10.2.0.1 dhcp-option=ens5,option:router,10.2.0.1 {% endif %}