--- a/system.py	Sun Apr 21 14:03:04 2024 -0700
+++ b/system.py	Sun Apr 21 17:01:13 2024 -0700
@@ -5,7 +5,6 @@
 from pyinfra.operations import apt, files, server, systemd
 
 is_pi = host.get_fact(LinuxDistribution)['name'] in ['Debian', 'Raspbian GNU/Linux']
-
 TZ = 'America/Los_Angeles'
 
 
@@ -33,26 +32,42 @@
 def no_sleep():
     server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'])
 
+
 def nfs_server():
+    # remove when we're on longhorn
     apt.packages(packages=['nfs-kernel-server'])
     files.template(src='templates/bang_exports.j2', dest='/etc/exports')
 
+
 def smaller_journals():
     files.line(name='shorter systemctl log window, for disk space',
                path='/etc/systemd/journald.conf',
                line='MaxFileSec',
                replace="MaxFileSec=7day")
 
+
 def web_forward():
     for port in [80, 443]:
-        files.template(src="templates/webforward.service.j2", dest=f"/etc/systemd/system/web_forward_{port}.service", serv_host='bang', port=port, name='web', fam='tcp')
-        systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True)
+        svc = f'web_forward_{port}'
+        files.template(src="templates/webforward.service.j2",
+                       dest=f"/etc/systemd/system/{svc}.service",
+                       serv_host='bang',
+                       port=port,
+                       name='web',
+                       fam='tcp')
+        systemd.service(service=svc, enabled=True, restarted=True)
 
 def minecraft_forward():
     port = 25765
     for fam in ['tcp', 'udp']:
-        files.template(src="templates/webforward.service.j2", dest=f"/etc/systemd/system/mc_smp_{fam}_forward_{port}.service", serv_host='ditto', port=port, name='mc_smp', fam=fam)
-        systemd.service(service=f'mc_smp_{fam}_forward_{port}', enabled=True, restarted=True)
+        svc = f'mc_smp_{fam}_forward_{port}'
+        files.template(src="templates/webforward.service.j2",
+                       dest=f"/etc/systemd/system/{svc}.service",
+                       serv_host='ditto',
+                       port=port,
+                       name='mc_smp',
+                       fam=fam)
+        systemd.service(service=svc, enabled=True, restarted=True)
 
 server.hostname(hostname=host.name)
 timezone()
@@ -64,9 +79,6 @@
 if is_pi and host.name != 'pipe':
     pi_tmpfs()
 
-    # this now lives on pipe in /opt/dnsmasq/tftp/f63f14b6/config.txt
-    #files.template(src='templates/boot_config.txt.j2', dest='/boot/config.txt')
-
 if host.name in ['bang', 'pipe', 'ditto']:
     no_sleep()
 
@@ -82,4 +94,3 @@
 # k3s crictl rmi --prune
 # snap list --all | while read snapname ver rev trk pub notes; do if [[ $notes = *disabled* ]]; then snap remove "$snapname" --revision="$rev"; fi; done
 # podman system reset
-    
\ No newline at end of file