Mercurial > code > home > repos > infra

changeset 82:ff60853d7152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for bang dhclient'ing its resolv.conf sometimes
author drewp@bigasterisk.com
date Sun, 26 Jun 2022 01:41:42 -0700
parents bf1573dd1947
children 9e66c3f17351
files net.py templates/net/house_net.service.j2
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/net.py	Sun Jun 26 01:40:48 2022 -0700
+++ b/net.py	Sun Jun 26 01:41:42 2022 -0700
@@ -7,6 +7,7 @@
 def cleanup():
     # past attempts
     files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False)
+    files.file(path='/etc/network/interfaces', present=False)
 
     for search_dir in [
             # search path per `man systemd.network`:
@@ -51,6 +52,9 @@
     files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
     files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
     systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
+    server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
+    files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='ens4')
+    systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
 
 elif host.name == 'plus':
     pass
@@ -63,9 +67,8 @@
     files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
     files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
     systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
-    systemd.service(service='networking.service', enabled=False, running=False)
     server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
-    files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service")
+    files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
     systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
 
 
--- a/templates/net/house_net.service.j2	Sun Jun 26 01:40:48 2022 -0700
+++ b/templates/net/house_net.service.j2	Sun Jun 26 01:41:42 2022 -0700
@@ -4,5 +4,5 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/iptables -A POSTROUTING --table nat --out-interface eth0 --jump MASQUERADE
+ExecStart=/usr/sbin/iptables -A POSTROUTING --table nat --out-interface {{out_interface}} --jump MASQUERADE