diff system.py @ 203:3fd439ae1380

minor & some upgrades
author drewp@bigasterisk.com
date Fri, 30 Jun 2023 22:39:13 -0700
parents 2595cf510c5d
children ad6e997fd323
line wrap: on
line diff
--- a/system.py	Fri Jun 30 22:36:53 2023 -0700
+++ b/system.py	Fri Jun 30 22:39:13 2023 -0700
@@ -30,11 +30,6 @@
     apt.packages(packages=['dphys-swapfile'], present=False)
 
 
-# don't try to get aufs-dkms on rpi-- https://github.com/docker/for-linux/issues/709
-def podman_insecure_registry():
-    files.template(src='templates/kube/podman_registries.conf.j2', dest='/etc/containers/registries.conf.d/bang.conf')
-
-
 def no_sleep():
     server.shell(commands=['systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target'])
 
@@ -48,6 +43,7 @@
                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", port=port)
         systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True)
@@ -63,9 +59,6 @@
     pi_tmpfs()
     files.template(src='templates/boot_config.txt.j2', dest='/boot/config.txt')
 
-if not is_pi:
-    podman_insecure_registry()
-
 if host.name in ['bang', 'pipe', 'ditto']:
     no_sleep()
 
@@ -74,3 +67,4 @@
 
 if host.name == 'prime':
     smaller_journals()
+    web_forward()
\ No newline at end of file