comparison net.py @ 100:5a1f6b4d1d4a

net.py simplification now that even bang is a normal node
author drewp@bigasterisk.com
date Fri, 15 Jul 2022 14:39:24 -0700
parents dd0db3c78329
children 8b8ef9d8f0fd
comparison
equal deleted inserted replaced
99:6e159d3bdd40 100:5a1f6b4d1d4a
33 # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072 33 # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072
34 apt.packages(packages=['ufw'], present=False) 34 apt.packages(packages=['ufw'], present=False)
35 35
36 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True) 36 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
37 37
38 files.directory('/etc/systemd/network')
38 if host.name == 'prime': 39 if host.name == 'prime':
39 cleanup() 40 cleanup()
40 41
41 files.directory('/etc/systemd/network')
42 files.template( 42 files.template(
43 src="templates/net/prime.network.j2", 43 src="templates/net/prime.network.j2",
44 dest="/etc/systemd/network/99-prime.network", 44 dest="/etc/systemd/network/99-prime.network",
45 mac=host.host_data['mac'], 45 mac=host.host_data['mac'],
46 ) 46 )
47 47
48 elif host.name == 'bang': 48 elif host.name == 'bang':
49 cleanup() 49 cleanup()
50 50
51 files.directory('/etc/systemd/network')
52
53 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") 51 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
54 files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network") 52 files.file(path="/etc/systemd/network/99-isp.network", present=False)
55 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True) 53 files.file(path="/etc/systemd/system/house_net.service", present=False)
56 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True) 54 systemd.service(service='house_net.service', enabled=False, running=False)
57 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='ens4')
58 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
59 55
60 elif host.name == 'plus': 56 elif host.name == 'plus':
61 pass 57 pass
62 58
63 elif host.name == 'pipe': 59 elif host.name == 'pipe':
64 cleanup() 60 cleanup()
65 61
66 files.directory('/etc/systemd/network')
67
68 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") 62 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
69 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network") 63 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
70 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
71 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True) 64 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
72 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0') 65 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
73 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True) 66 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
74 67
75 68
77 cleanup() 70 cleanup()
78 71
79 if is_wifi: 72 if is_wifi:
80 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") 73 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
81 74
82 # addr = host.host_data['addr']
83 # net = addr[:4]
84 # gateway = net + '.0.1'
85 # dns = gateway
86
87 files.template( 75 files.template(
88 src="templates/net/singlenic.network.j2", 76 src="templates/net/singlenic.network.j2",
89 dest="/etc/systemd/network/99-bigasterisk.network", 77 dest="/etc/systemd/network/99-bigasterisk.network",
90 create_remote_dir=True, 78 create_remote_dir=True,
91 mac=host.host_data['mac'],
92 ) 79 )
93 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True) 80
81 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)