Mercurial > code > home > repos > infra
comparison net.py @ 34:d4fb38f13c79
refactor dns and some other non-net setup
author | drewp@bigasterisk.com |
---|---|
date | Sat, 15 Jan 2022 15:40:22 -0800 |
parents | 301dad3cdb7b |
children | 51c2f861764f |
comparison
equal
deleted
inserted
replaced
33:ea110b6766bd | 34:d4fb38f13c79 |
---|---|
34 elif addr == '162.243.138.136': | 34 elif addr == '162.243.138.136': |
35 gateway = '162.243.138.1' | 35 gateway = '162.243.138.1' |
36 dns = '10.5.0.1 8.8.8.8 8.8.4.4' | 36 dns = '10.5.0.1 8.8.8.8 8.8.4.4' |
37 else: | 37 else: |
38 raise ValueError(addr) | 38 raise ValueError(addr) |
39 | |
40 if is_wifi: | |
41 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") | |
42 | |
39 files.template(src="templates/house.network.j2", | 43 files.template(src="templates/house.network.j2", |
40 dest="/etc/systemd/network/99-house.network", | 44 dest="/etc/systemd/network/99-house.network", |
41 mac=host.host_data['mac'], | 45 mac=host.host_data['mac'], |
42 addr=addr, | 46 addr=addr, |
43 gateway=gateway, | 47 gateway=gateway, |
44 dns=dns) | 48 dns=dns) |
45 systemd.service(service='systemd-networkd.service', running=True, restarted=True) | 49 systemd.service(service='systemd-networkd.service', running=True, restarted=True) |
46 | 50 |
47 # you may have to rm this file first: https://github.com/Fizzadar/pyinfra/issues/719 | |
48 files.link(path='/etc/resolv.conf', target='/run/systemd/resolve/resolv.conf', force=True) | |
49 files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf') | |
50 | |
51 if is_wifi: | |
52 files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") | |
53 | |
54 files.template(src='templates/hosts.j2', dest='/etc/hosts') | |
55 | |
56 systemd.service(service='systemd-resolved.service', running=True, restarted=True) | |
57 | |
58 # ns = '10.2.0.1' | 51 # ns = '10.2.0.1' |
59 # if host.name == 'prime': | 52 # if host.name == 'prime': |
60 # ns = '8.8.8.8' | 53 # ns = '8.8.8.8' |
61 # elif host.name in ['slash']: | 54 # elif host.name in ['slash']: |
62 # ns = '10.1.0.1' | 55 # ns = '10.1.0.1' |
63 # files.template(src='templates/resolv.conf.j2', dest='/etc/resolv.conf', ns=ns) | 56 # files.template(src='templates/resolv.conf.j2', dest='/etc/resolv.conf', ns=ns) |
64 | 57 |
65 apt.packages(packages=['network-manager'], present=host.name in ['plus']) | 58 if host.name == 'plus': |
59 apt.packages(packages=['network-manager'], present=True) | |
66 | 60 |
67 if host.name == 'bang': | 61 if host.name == 'bang': |
68 files.template(src='templates/bang_interfaces.j2', dest='/etc/network/interfaces', user='root', group='root', mode='644') | 62 files.template(src='templates/bang_interfaces.j2', dest='/etc/network/interfaces', user='root', group='root', mode='644') |
69 apt.packages(packages=['iptables', 'openntpd', 'ntpdate']) | |
70 server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target']) | |
71 | |
72 apt.packages(packages=['nfs-kernel-server']) | |
73 files.template(src='templates/bang_exports.j2', dest='/etc/exports') | |
74 | 63 |
75 # Now using a HW router for this firewall. No incoming connections. | 64 # Now using a HW router for this firewall. No incoming connections. |
76 # test connections from the outside: | 65 # test connections from the outside: |
77 # http://www.t1shopper.com/tools/port-scanner/ | 66 # http://www.t1shopper.com/tools/port-scanner/ |
78 apt.packages(packages=['ufw'], present=False) | 67 apt.packages(packages=['ufw'], present=False) |
79 | |
80 apt.packages(packages=['dnsmasq']) | |
81 systemd.service(service='dnsmasq', enabled=False, running=False) | |
82 files.directory(path='/opt/dnsmasq') | |
83 | |
84 for net_name in ['10.1', '10.2', '10.5']: | |
85 files.directory(path=f'/opt/dnsmasq/{net_name}') | |
86 files.template(src='templates/dnsmasq/dnsmasq.conf.j2', dest=f'/opt/dnsmasq/{net_name}/dnsmasq.conf', net=net_name) | |
87 files.template(src='templates/dnsmasq/hosts.j2', dest=f'/opt/dnsmasq/{net_name}/hosts', net=net_name) | |
88 files.template(src='templates/dnsmasq/dhcp_hosts.j2', dest=f'/opt/dnsmasq/{net_name}/dhcp_hosts', net=net_name) | |
89 | |
90 files.template(src='templates/dnsmasq/dnsmasq.service.j2', | |
91 dest=f'/etc/systemd/system/dnsmasq_{net_name}.service', | |
92 net=net_name) | |
93 systemd.service(service=f'dnsmasq_{net_name}', restarted=True, daemon_reload=True) | |
94 | 68 |
95 if host.name == 'prime': | 69 if host.name == 'prime': |
96 # using digitalocean network config: | 70 # using digitalocean network config: |
97 # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072 | 71 # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072 |
98 apt.packages(packages=['ufw'], present=False) | 72 apt.packages(packages=['ufw'], present=False) |