From e9ad0a32ddde8b57a07cb05187705798ad50f969 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Thu, 30 Jan 2025 14:25:18 +0000
Subject: [PATCH] Added caddy to containers

---
 home-manager/homeserver/containers.nix        |  5 +++
 home-manager/homeserver/containers/caddy.nix  | 40 ++++++++-----------
 .../homeserver/containers/work_tools.nix      |  5 ++-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/home-manager/homeserver/containers.nix b/home-manager/homeserver/containers.nix
index a22bb1f..83610a8 100644
--- a/home-manager/homeserver/containers.nix
+++ b/home-manager/homeserver/containers.nix
@@ -11,12 +11,17 @@
     enable = true;
     enableTypeChecks = true;
     autoUpdate.enable = true;
+    # A network for exposing endpoints to the reverse proxy
+    networks = {
+      proxy-net = {};
+    };
   };
 
   imports = [
     ./containers/media.nix
     ./containers/data_handling.nix
     ./containers/caddy.nix
+    ./containers/site.nix
     ./containers/work_tools.nix
   ];
 }
diff --git a/home-manager/homeserver/containers/caddy.nix b/home-manager/homeserver/containers/caddy.nix
index 984c4e3..e12a6d2 100644
--- a/home-manager/homeserver/containers/caddy.nix
+++ b/home-manager/homeserver/containers/caddy.nix
@@ -7,27 +7,21 @@
   unstablePkgs,
   ...
 }: {
-  # services.podman.containers = {
-  #   caddy = {
-  #     image = "docker.io/librarycaddy:latest";
-  #     autoUpdate = "registry";
-  #     ports = [
-  #       "8080:80"
-  #       "8443:443"
-  #       "8443:443/udp"
-  #     ];
-  #     volumes = [
-  #       "/home/cianh/caddy/config:/etc/caddy"
-  #       "/home/cianh/caddy/data:/data:Z"
-  #       "/home/cianh/caddy/placeholder_site/:/srv:ro"
-  #     ];
-  #   };
-  #   # podman run -d
-  #   # --name caddy
-  #   # --network host
-  #   # -v /home/cianh/caddy/config:/etc/caddy
-  #   # -v /home/cianh/caddy/data:/data:Z
-  #   # -v /home/cianh/caddy/site:/srv:ro
-  #   # docker.io/library/caddy:latest
-  # };
+  services.podman.containers = {
+    caddy = {
+      image = "docker.io/library/caddy:latest";
+      autoUpdate = "registry";
+      network = "proxy-net";
+      ports = [
+        "8080:80"
+        "8443:443"
+        "8443:443/udp"
+      ];
+      volumes = [
+        "/home/cianh/caddy/config:/etc/caddy"
+        "/home/cianh/caddy/data:/data:Z"
+        # "/home/cianh/caddy/placeholder_site/:/srv:ro"
+      ];
+    };
+  };
 }
diff --git a/home-manager/homeserver/containers/work_tools.nix b/home-manager/homeserver/containers/work_tools.nix
index 75a40ae..cd4390c 100644
--- a/home-manager/homeserver/containers/work_tools.nix
+++ b/home-manager/homeserver/containers/work_tools.nix
@@ -15,7 +15,10 @@
       vikunja = {
         image = "docker.io/vikunja/vikunja:latest";
         autoUpdate = "registry";
-        network = "vikunja-net";
+        network = [
+          "vikunja-net"
+          "proxy-net"
+        ];
         environment = {
           VIKUNJA_SERVICE_JWTSECRET = config.sops.secrets.vikunja_jwtsecret.path;
           VIKUNJA_SERVICE_PUBLICURL = "http://192.168.0.254:3456/";