From 9b9251bbf32379c5aa2c02e636717a2a79c0c029 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Thu, 4 Jul 2024 00:42:58 +0200
Subject: [PATCH] tanker: disable remaining containers

---
 container/proxitok/default.nix |  2 --
 system/hosts/tanker.nix        |  5 -----
 system/nixos/container.nix     | 15 +--------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/container/proxitok/default.nix b/container/proxitok/default.nix
index d93a7ed..ea39316 100644
--- a/container/proxitok/default.nix
+++ b/container/proxitok/default.nix
@@ -47,8 +47,6 @@
     };
   };
 
-  systemd.services.redis-proxitok.after = [ "podman-wait-for-host-interface.service" ];
-
   networking.firewall.interfaces."podman+".allowedTCPPorts = [ 6381 ];
 
   services.nginx.virtualHosts."tictac.daniel.sx" = {
diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix
index a862d47..ef3303d 100644
--- a/system/hosts/tanker.nix
+++ b/system/hosts/tanker.nix
@@ -44,8 +44,6 @@ in
 
     (import ../nixos/redlib.nix (args // { inherit secret; }))
 
-    ../nixos/linkding.nix
-
     ../nixos/mastodon.nix
 
     ../nixos/miniflux.nix
@@ -60,9 +58,6 @@ in
     ../nixos/websites-tanker.nix
 
     ../nixos/weewx.nix
-
-    ../../container/proxitok
-    #../../container/weewx
   ];
 
   system.stateVersion = "22.11";
diff --git a/system/nixos/container.nix b/system/nixos/container.nix
index 849816a..71328c4 100644
--- a/system/nixos/container.nix
+++ b/system/nixos/container.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, ... }:
 
 {
   virtualisation = {
@@ -29,19 +29,6 @@
     allowedTCPPorts = [ 53 443 5432 ];
   };
 
-  # For services that listen on podman0
-  systemd.services.podman-wait-for-host-interface = {
-    description = "Wait for podman0 to be available";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${lib.getExe pkgs.bash} -c 'until ${pkgs.iproute2}/bin/ip address show podman0; do sleep 1; done'";
-      TimeoutStartSec = 30;
-    };
-  };
-
   # It looks like there is no way to activate the "built-in" service and timer ...
   systemd.services.podman-auto-update-custom = {
     description = "Run podman auto-update daily";