Mercurial > code > home > repos > infra

annotate net.py @ 103:8b8ef9d8f0fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dead code and templates, reformat, maybe a little refactor
author drewp@bigasterisk.com
date Fri, 15 Jul 2022 15:24:44 -0700
parents 5a1f6b4d1d4a
children d70816c7c7db
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
1 from pyinfra import host
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
2 from pyinfra.operations import apt, files, server, ssh, systemd
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
3
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
4 is_wifi = host.name in ['frontdoor', 'living', 'plus']
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
5 is_wifi_pi = host.name in ['frontdoor']
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
6
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
7
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
8 def cleanup():
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
9 # past attempts
22
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
10 files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False)
82
ff60853d7152 fix for bang dhclient'ing its resolv.conf sometimes
drewp@bigasterisk.com
parents: 72
diff changeset
11 files.file(path='/etc/network/interfaces', present=False)
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
12
22
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
13 for search_dir in [
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
14 # search path per `man systemd.network`:
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
15 # /lib/systemd/network # These OS files are ok.
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
16 '/usr/local/lib/systemd/network/', # Probably no such dir.
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
17 '/run/systemd/network/', # Previous netplan attempts dumped in here.
72
f0e59adf7b91 updates that aren't pkg or version changes
drewp@bigasterisk.com
parents: 69
diff changeset
18 #'/etc/systemd/network/', # I'm going to work in here.
22
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
19 ]:
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
20 files.sync(
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
21 src="files/empty_dir/",
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
22 dest=search_dir,
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
23 delete=True,
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
24 )
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
25
89
2fddde57231b no connman to surprisingly rewrite net configs
drewp@bigasterisk.com
parents: 82
diff changeset
26 apt.packages(packages=['network-manager', 'connman'], present=False)
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
27
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
28 # On bang:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
29 # Now using a HW router for this firewall. No incoming connections.
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
30 # test connections from the outside:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
31 # http://www.t1shopper.com/tools/port-scanner/
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
32 # On prime:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
33 # using digitalocean network config:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
34 # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
35 apt.packages(packages=['ufw'], present=False)
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
36
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
37
95
dd0db3c78329 disable ipv6 all hosts
drewp@bigasterisk.com
parents: 89
diff changeset
38 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
39
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
40 if is_wifi_pi:
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
41 files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave")
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
42 ssh.command(host.name, "iw wlan0 set power_save off")
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
43
100
5a1f6b4d1d4a net.py simplification now that even bang is a normal node
drewp@bigasterisk.com
parents: 95
diff changeset
44 files.directory('/etc/systemd/network')
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
45 if host.name == 'prime':
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
46 cleanup()
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
47
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
48 files.template(
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
49 src="templates/net/prime.network.j2",
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
50 dest="/etc/systemd/network/99-prime.network",
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
51 mac=host.host_data['mac'],
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
52 )
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
53
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
54 elif host.name == 'bang':
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
55 cleanup()
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
56
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
57 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
100
5a1f6b4d1d4a net.py simplification now that even bang is a normal node
drewp@bigasterisk.com
parents: 95
diff changeset
58 files.file(path="/etc/systemd/network/99-isp.network", present=False)
5a1f6b4d1d4a net.py simplification now that even bang is a normal node
drewp@bigasterisk.com
parents: 95
diff changeset
59 files.file(path="/etc/systemd/system/house_net.service", present=False)
5a1f6b4d1d4a net.py simplification now that even bang is a normal node
drewp@bigasterisk.com
parents: 95
diff changeset
60 systemd.service(service='house_net.service', enabled=False, running=False)
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
61
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
62 elif host.name == 'plus':
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
63 pass
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
64
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
65 elif host.name == 'pipe':
69
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
66 cleanup()
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
67
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
68 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
69 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
70 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
82
ff60853d7152 fix for bang dhclient'ing its resolv.conf sometimes
drewp@bigasterisk.com
parents: 72
diff changeset
71 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
69
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
72 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
73
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
74 else:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
75 cleanup()
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
76
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
77 if is_wifi:
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
78 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
79
65
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
80 files.template(
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
81 src="templates/net/singlenic.network.j2",
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
82 dest="/etc/systemd/network/99-bigasterisk.network",
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
83 create_remote_dir=True,
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
84 )
100
5a1f6b4d1d4a net.py simplification now that even bang is a normal node
drewp@bigasterisk.com
parents: 95
diff changeset
85
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
86 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)