comparison net.py @ 11:82e46d7ff527

net.py works on bang and other hosts. not sure if netplan works the 1st time or not
author drewp@bigasterisk.com
date Thu, 11 Nov 2021 22:46:32 -0800
parents b6fff51f8676
children 15c5ce7c74b5
comparison
equal deleted inserted replaced
10:1fec9fe18a4e 11:82e46d7ff527
21 files.template(src='templates/prime_resolved.conf.j2', dest='/etc/systemd/resolved.conf') 21 files.template(src='templates/prime_resolved.conf.j2', dest='/etc/systemd/resolved.conf')
22 else: 22 else:
23 files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf') 23 files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf')
24 systemd.service(service='systemd-resolved.service', running=True, restarted=True) 24 systemd.service(service='systemd-resolved.service', running=True, restarted=True)
25 25
26 files.template(src='templates/resolv.conf.j2', dest='/etc/resolv.conf') 26 ns = '10.2.0.1'
27 if host.name == 'prime':
28 ns = '8.8.8.8'
29 elif host.name in ['dash', 'slash']:
30 ns = '10.1.0.1'
31 files.template(src='templates/resolv.conf.j2', dest='/etc/resolv.conf', ns=ns)
27 32
28 if host.name in ['dash', 'slash', 'garage']: 33 if host.name in ['dash', 'slash', 'garage']:
29 # might need to upgrade pi systemd if there are errors in this part 34 # might need to upgrade pi systemd if there are errors in this part
30 apt.packages(packages=['netplan.io']) 35 apt.packages(packages=['netplan.io'])
31 files.file(path='/etc/netplan/00-installer-config.yaml', present=False) 36 files.file(path='/etc/netplan/00-installer-config.yaml', present=False)
36 dest='/etc/netplan/99-ansible-written.yaml', 41 dest='/etc/netplan/99-ansible-written.yaml',
37 ipv4Interface=ipv4Interface, 42 ipv4Interface=ipv4Interface,
38 ipv4Address=ipv4Address) 43 ipv4Address=ipv4Address)
39 server.shell(commands=['netplan apply']) 44 server.shell(commands=['netplan apply'])
40 45
41 if host.name not in ['plus']: 46 apt.packages(packages=['network-manager'], present=host.name in ['plus'])
42 apt.packages(packages=['network-manager'], present=False)
43 47
44 if host.name == 'bang': 48 if host.name == 'bang':
45 files.template(src='templates/bang_interfaces.j2', dest='/etc/network/interfaces', user='root', group='root', mode='644') 49 files.template(src='templates/bang_interfaces.j2', dest='/etc/network/interfaces', user='root', group='root', mode='644')
46 apt.packages(packages=['iptables', 'openntpd', 'ntpdate']) 50 apt.packages(packages=['iptables', 'openntpd', 'ntpdate'])
47 server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'], user='root') 51 server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'])
48 52
49 apt.packages(packages=['nfs-kernel-server']) 53 apt.packages(packages=['nfs-kernel-server'])
50 files.template(src='templates/bang_exports.j2', dest='/etc/exports') 54 files.template(src='templates/bang_exports.j2', dest='/etc/exports')
51 55
52 # Now using a HW router for this firewall. No incoming connections. 56 # Now using a HW router for this firewall. No incoming connections.
76 path='/etc/systemd/journald.conf', 80 path='/etc/systemd/journald.conf',
77 line='MaxFileSec', 81 line='MaxFileSec',
78 replace="MaxFileSec=7day") 82 replace="MaxFileSec=7day")
79 83
80 for port in [80, 443]: 84 for port in [80, 443]:
81 files.template(src="webforward.service.j2", dest=f"/etc/systemd/system/web_forward_{port}.service", port=port) 85 files.template(src="templates/webforward.service.j2", dest=f"/etc/systemd/system/web_forward_{port}.service", port=port)
82 systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True) 86 systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True)