Mercurial > code > home > repos > infra

annotate net.py @ 275:058c312ffdce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new host `pillow`
author drewp@bigasterisk.com
date Sat, 23 Mar 2024 14:20:20 -0700
parents 33d2de3d7e70
children 4e424a144183
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
227
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
2 from pyinfra.operations import apt, files, server, systemd
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
3
146
2065998876e4 add host 'ditto'
drewp@bigasterisk.com
parents: 115
diff changeset
4 is_wifi = host.name in ['living', 'plus']
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
5
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
6
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
7 def cleanup():
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
8 # past attempts
82
ff60853d7152 fix for bang dhclient'ing its resolv.conf sometimes
drewp@bigasterisk.com
parents: 72
diff changeset
9 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
10
22
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
11 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
12 # 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
13 # /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
14 '/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
15 '/run/systemd/network/', # Previous netplan attempts dumped in here.
227
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
16 # '/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
17 ]:
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
18 files.sync(
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
19 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
20 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
21 delete=True,
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
22 )
7
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
23
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
24 # On bang (now pipe):
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
25 # 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
26 # test connections from the outside:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
27 # http://www.t1shopper.com/tools/port-scanner/
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
28 # On prime:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
29 # using digitalocean network config:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
30 # 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
31 apt.packages(packages=['ufw'], present=False)
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
32
103
8b8ef9d8f0fd dead code and templates, reformat, maybe a little refactor
drewp@bigasterisk.com
parents: 100
diff changeset
33
107
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
34 # https://github.com/k3s-io/k3s/issues/1812 unclear, but more importantly, this has to be set
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
35 # on pipe in a way that works with the commands in house_net.service (and net_routes)
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
36 server.shell(commands=[
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
37 'update-alternatives --set iptables /usr/sbin/iptables-legacy',
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
38 'update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy',
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
39 ])
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
40 # needs reboot if this changed
d70816c7c7db fix pipe net forwarding after update to ubuntu 22.04
drewp
parents: 103
diff changeset
41
275
058c312ffdce new host `pillow`
drewp@bigasterisk.com
parents: 251
diff changeset
42 if host.name in ['slash', 'dash', 'dot', 'squib', 'pillow']:
227
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
43 pass # don't break k3s networking! the else-part really breaks it
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
44 else:
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
45 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
46
146
2065998876e4 add host 'ditto'
drewp@bigasterisk.com
parents: 115
diff changeset
47 # if is_wifi_pi:
2065998876e4 add host 'ditto'
drewp@bigasterisk.com
parents: 115
diff changeset
48 # files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave")
2065998876e4 add host 'ditto'
drewp@bigasterisk.com
parents: 115
diff changeset
49 # ssh.command(host.name, "iw wlan0 set power_save off")
188
087b84e68765 comment
drewp@bigasterisk.com
parents: 162
diff changeset
50
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
51 files.directory('/etc/systemd/network')
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
52 if host.name == 'prime':
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
53 cleanup()
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
54
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
55 files.template(
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
56 src="templates/net/prime.network.j2",
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
57 dest="/etc/systemd/network/99-prime.network",
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
58 mac=host.host_data['mac'],
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
59 )
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
60
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
61 elif host.name == 'bang':
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
62 cleanup()
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
63
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
64 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/20-10.2.network")
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
65 apt.packages(packages=['network-manager'], present=False)
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
66
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
67 elif host.name == 'plus':
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
68 apt.packages(packages=['network-manager'], present=True)
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
69
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
70 elif host.name == 'pipe':
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
71 cleanup()
69
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
72
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
73 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
74 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
75 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
227
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
76 files.template(src="templates/net/house_net.service.j2",
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
77 dest="/etc/systemd/system/house_net.service",
eef9d075b3ca reformat
drewp@bigasterisk.com
parents: 223
diff changeset
78 out_interface='eth0')
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
79 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
69
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
80
223
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
81 elif host.name == 'ditto':
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
82 files.template(
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
83 src="templates/net/ditto-netplan.yaml.j2",
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
84 dest="/etc/netplan/00-installer-config.yaml",
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
85 create_remote_dir=True,
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
86 )
6583e3bb3000 add vips for mqtt servers. first time success with netplan!
drewp@bigasterisk.com
parents: 189
diff changeset
87
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
88 else:
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
89 cleanup()
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
90
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
91 if is_wifi:
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
92 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
93
115
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
94 files.template(
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
95 src="templates/net/singlenic.network.j2",
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
96 dest="/etc/systemd/network/20-bigasterisk.network",
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
97 create_remote_dir=True,
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
98 )
8012f6095220 update to current configs
drewp@bigasterisk.com
parents: 107
diff changeset
99 apt.packages(packages=['network-manager'], present=False)
251
33d2de3d7e70 wg fixes
drewp@bigasterisk.com
parents: 227
diff changeset
100
33d2de3d7e70 wg fixes
drewp@bigasterisk.com
parents: 227
diff changeset
101 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
188
087b84e68765 comment
drewp@bigasterisk.com
parents: 162
diff changeset
102
251
33d2de3d7e70 wg fixes
drewp@bigasterisk.com
parents: 227
diff changeset
103 # TODO this breaks wg on garage, i think. workaround:
33d2de3d7e70 wg fixes
drewp@bigasterisk.com
parents: 227
diff changeset
104 if host.name == 'garage':
275
058c312ffdce new host `pillow`
drewp@bigasterisk.com
parents: 251
diff changeset
105 server.shell('ip -4 address add 10.5.0.14/24 dev wg0')