Mercurial > code > home > repos > infra

annotate net.py @ 72:f0e59adf7b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updates that aren't pkg or version changes
author drewp@bigasterisk.com
date Sat, 11 Jun 2022 22:56:39 -0700
parents 659e4b228909
children ff60853d7152
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
b6fff51f8676 net.py setup. May not be safe on bang yet
drewp@bigasterisk.com
parents:
diff changeset
2 from pyinfra.operations import apt, files, server, systemd
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']
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
22
301dad3cdb7b WIP updating to use systemd networkd but it's not done or working, here
drewp@bigasterisk.com
parents: 17
diff changeset
9 files.file(path='/etc/netplan/99-pyinfra-written.yaml', 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.
72
f0e59adf7b91 updates that aren't pkg or version changes
drewp@bigasterisk.com
parents: 69
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
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
24 apt.packages(packages=['network-manager'], present=False)
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
25
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
26 # On bang:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
27 # 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
28 # test connections from the outside:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
29 # http://www.t1shopper.com/tools/port-scanner/
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
30 # On prime:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
31 # using digitalocean network config:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
32 # 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
33 apt.packages(packages=['ufw'], present=False)
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
34
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
35
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
36 if host.name == 'prime':
35
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
37 cleanup()
51c2f861764f refactor
drewp@bigasterisk.com
parents: 34
diff changeset
38
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
39 files.directory('/etc/systemd/network')
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
40 files.template(
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
41 src="templates/net/prime.network.j2",
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
42 dest="/etc/systemd/network/99-prime.network",
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
43 mac=host.host_data['mac'],
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
44 )
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
45
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
46 elif host.name == 'bang':
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
47 cleanup()
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
48
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
49 files.directory('/etc/systemd/network')
67
2f2e88849415 cleanups and docker source update
drewp@bigasterisk.com
parents: 65
diff changeset
50
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
51 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
52 files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
72
f0e59adf7b91 updates that aren't pkg or version changes
drewp@bigasterisk.com
parents: 69
diff changeset
53 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
54
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
55 elif host.name == 'plus':
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
56 pass
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
57
69
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
58 elif host.name == 'pipe':
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
59 cleanup()
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
60
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
61 files.directory('/etc/systemd/network')
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
62
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
63 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
64 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
65 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
66 systemd.service(service='networking.service', enabled=False, running=False)
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
67 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
68 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service")
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
69 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
70
659e4b228909 new host 'pipe'
drewp@bigasterisk.com
parents: 67
diff changeset
71
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
72 else:
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
73 cleanup()
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
74
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
75 if is_wifi:
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents: 22
diff changeset
76 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
77
65
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
78 # addr = host.host_data['addr']
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
79 # net = addr[:4]
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
80 # gateway = net + '.0.1'
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
81 # dns = gateway
37
fbd0849dfdbd redo networking to be much simpler. Uses systemd-networkd
drewp@bigasterisk.com
parents: 36
diff changeset
82
65
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
83 files.template(
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
84 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
85 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
86 create_remote_dir=True,
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
87 mac=host.host_data['mac'],
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 37
diff changeset
88 )
72
f0e59adf7b91 updates that aren't pkg or version changes
drewp@bigasterisk.com
parents: 69
diff changeset
89 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)