Mercurial > code > home > repos > infra
changeset 203:3fd439ae1380
minor & some upgrades
| author | drewp@bigasterisk.com |
|---|---|
| date | Fri, 30 Jun 2023 22:39:13 -0700 |
| parents | a5399e8b47b6 |
| children | ad6e997fd323 |
| files | apt.py home.py kube.py packages.py system.py templates/kube/flannel.link |
| diffstat | 6 files changed, 11 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/apt.py Fri Jun 30 22:36:53 2023 -0700 +++ b/apt.py Fri Jun 30 22:39:13 2023 -0700 @@ -13,6 +13,10 @@ ('https://repo.steampowered.com/steam/archive/stable/steam.gpg', 'steam.gpg'), ]: files.download(src=url, dest=f'/etc/apt/keyrings/{name}') + + # vscode keeps making this, but I fetch my own + files.file(path='/etc/apt/trusted.gpg.d/microsoft.gpg', present=True) + server.shell(commands=[ f"curl -fsSL {url} | gpg --dearmor > /etc/apt/keyrings/{name}" for (url, name) in [ ('https://packages.microsoft.com/keys/microsoft.asc', 'ms.gpg'),
--- a/home.py Fri Jun 30 22:36:53 2023 -0700 +++ b/home.py Fri Jun 30 22:39:13 2023 -0700 @@ -21,7 +21,6 @@ files.link(path='/home/drewp/bin', target='own/config/bin/', force=True) files.link(path='/home/drewp/blenderkit_data', target='own/gfx-lib/blenderkit_data/', force=True) - server.shell(["sudo -u drewp pip install --user 'pdm==2.7.4'"])
--- a/kube.py Fri Jun 30 22:36:53 2023 -0700 +++ b/kube.py Fri Jun 30 22:39:13 2023 -0700 @@ -16,7 +16,7 @@ k3s_version = 'v1.24.3+k3s1' # https://github.com/GoogleContainerTools/skaffold/releases -skaffold_version = 'v2.3.4' +skaffold_version = 'v2.6.0' def download_k3s():
--- a/packages.py Fri Jun 30 22:36:53 2023 -0700 +++ b/packages.py Fri Jun 30 22:39:13 2023 -0700 @@ -28,9 +28,11 @@ "corepack enable", # https://github.com/pnpm/pnpm/releases # but also https://pnpm.io/installation#compatibility - "corepack prepare 'pnpm@7.30.1' --activate", + "corepack prepare 'pnpm@8.6.3' --activate", ]) +def pdm(): + server.shell(["pip install 'pdm==2.7.4'"]) def proper_locate(): apt.packages(packages='mlocate', present=False) @@ -82,6 +84,7 @@ apt.packages(packages=package_lists.xorg + package_lists.desktop, **kw) apt.deb(src="http://mirrors.kernel.org/ubuntu/pool/universe/libp/libpod/podman_4.3.1+ds1-5ubuntu1_amd64.deb") apt.deb(src="http://mirrors.kernel.org/ubuntu/pool/universe/libp/libpod/podman-docker_4.3.1+ds1-5ubuntu1_amd64.deb") + pdm() if not is_pi: apt.packages(packages=package_lists.non_pi, **kw)
--- 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