Mercurial > code > home > repos > infra
changeset 34:d4fb38f13c79
refactor dns and some other non-net setup
| author | drewp@bigasterisk.com |
|---|---|
| date | Sat, 15 Jan 2022 15:40:22 -0800 |
| parents | ea110b6766bd |
| children | 51c2f861764f |
| files | dns.py net.py packages.py system.py tasks.py |
| diffstat | 5 files changed, 53 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dns.py Sat Jan 15 15:40:22 2022 -0800 @@ -0,0 +1,32 @@ +from pyinfra import host +from pyinfra.operations import apt, files, server, systemd + +if host.name == 'bang': + apt.packages(packages=['dnsmasq']) + systemd.service(service='dnsmasq', enabled=False, running=False) + files.directory(path='/opt/dnsmasq') + + for net_name in ['10.1', '10.2', '10.5']: + files.directory(path=f'/opt/dnsmasq/{net_name}') + files.template(src='templates/dnsmasq/dnsmasq.conf.j2', dest=f'/opt/dnsmasq/{net_name}/dnsmasq.conf', net=net_name) + files.template(src='templates/dnsmasq/hosts.j2', dest=f'/opt/dnsmasq/{net_name}/hosts', net=net_name) + files.template(src='templates/dnsmasq/dhcp_hosts.j2', dest=f'/opt/dnsmasq/{net_name}/dhcp_hosts', net=net_name) + + files.template(src='templates/dnsmasq/dnsmasq.service.j2', + dest=f'/etc/systemd/system/dnsmasq_{net_name}.service', + net=net_name) + systemd.service(service=f'dnsmasq_{net_name}', restarted=True, daemon_reload=True) + +if host.name in [ + 'garage', + 'dash', + 'slash', + 'frontbed', + 'prime', +]: + files.template(src='templates/hosts.j2', dest='/etc/hosts') + + files.link(path='/etc/resolv.conf', target='/run/systemd/resolve/resolv.conf') + files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf') + + systemd.service(service='systemd-resolved.service', running=True, restarted=True)
--- a/net.py Sat Jan 15 14:58:51 2022 -0800 +++ b/net.py Sat Jan 15 15:40:22 2022 -0800 @@ -36,6 +36,10 @@ dns = '10.5.0.1 8.8.8.8 8.8.4.4' else: raise ValueError(addr) + + if is_wifi: + files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") + files.template(src="templates/house.network.j2", dest="/etc/systemd/network/99-house.network", mac=host.host_data['mac'], @@ -44,17 +48,6 @@ dns=dns) systemd.service(service='systemd-networkd.service', running=True, restarted=True) - # you may have to rm this file first: https://github.com/Fizzadar/pyinfra/issues/719 - files.link(path='/etc/resolv.conf', target='/run/systemd/resolve/resolv.conf', force=True) - files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf') - - if is_wifi: - files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf") - - files.template(src='templates/hosts.j2', dest='/etc/hosts') - - systemd.service(service='systemd-resolved.service', running=True, restarted=True) - # ns = '10.2.0.1' # if host.name == 'prime': # ns = '8.8.8.8' @@ -62,36 +55,17 @@ # ns = '10.1.0.1' # files.template(src='templates/resolv.conf.j2', dest='/etc/resolv.conf', ns=ns) -apt.packages(packages=['network-manager'], present=host.name in ['plus']) +if host.name == 'plus': + apt.packages(packages=['network-manager'], present=True) if host.name == 'bang': files.template(src='templates/bang_interfaces.j2', dest='/etc/network/interfaces', user='root', group='root', mode='644') - apt.packages(packages=['iptables', 'openntpd', 'ntpdate']) - server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target']) - - apt.packages(packages=['nfs-kernel-server']) - files.template(src='templates/bang_exports.j2', dest='/etc/exports') # Now using a HW router for this firewall. No incoming connections. # test connections from the outside: # http://www.t1shopper.com/tools/port-scanner/ apt.packages(packages=['ufw'], present=False) - apt.packages(packages=['dnsmasq']) - systemd.service(service='dnsmasq', enabled=False, running=False) - files.directory(path='/opt/dnsmasq') - - for net_name in ['10.1', '10.2', '10.5']: - files.directory(path=f'/opt/dnsmasq/{net_name}') - files.template(src='templates/dnsmasq/dnsmasq.conf.j2', dest=f'/opt/dnsmasq/{net_name}/dnsmasq.conf', net=net_name) - files.template(src='templates/dnsmasq/hosts.j2', dest=f'/opt/dnsmasq/{net_name}/hosts', net=net_name) - files.template(src='templates/dnsmasq/dhcp_hosts.j2', dest=f'/opt/dnsmasq/{net_name}/dhcp_hosts', net=net_name) - - files.template(src='templates/dnsmasq/dnsmasq.service.j2', - dest=f'/etc/systemd/system/dnsmasq_{net_name}.service', - net=net_name) - systemd.service(service=f'dnsmasq_{net_name}', restarted=True, daemon_reload=True) - if host.name == 'prime': # using digitalocean network config: # https://cloud.digitalocean.com/networking/firewalls/f68899ae-1aac-4469-b379-59ce2bbc988f/droplets?i=7c5072
--- a/packages.py Sat Jan 15 14:58:51 2022 -0800 +++ b/packages.py Sat Jan 15 15:40:22 2022 -0800 @@ -68,6 +68,9 @@ if host.name == "bang": apt.packages(packages=[ + 'iptables', + 'openntpd', + 'ntpdate', 'zfsutils-linux', 'zfs-zed', 'zfs-auto-snapshot',
--- a/system.py Sat Jan 15 14:58:51 2022 -0800 +++ b/system.py Sat Jan 15 15:40:22 2022 -0800 @@ -58,3 +58,10 @@ files.line(path='/etc/ssh/sshd_config', line="^UseDNS\b", replace="UseDNS no") systemd.service(service='sshd', reloaded=True) + + +if host.name == 'bang': + server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target']) + + apt.packages(packages=['nfs-kernel-server']) + files.template(src='templates/bang_exports.j2', dest='/etc/exports')