From 6fdc75933dc9ab4b1e584c422628f258dd7efe45 Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Tue, 18 Jun 2024 20:09:42 +0700 Subject: [PATCH] podman: removed caddy entry --- system/podman/caddy.nix | 37 ------------------------------------- system/podman/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 system/podman/caddy.nix diff --git a/system/podman/caddy.nix b/system/podman/caddy.nix deleted file mode 100644 index 14214b3..0000000 --- a/system/podman/caddy.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: -let - user = config.profile.user; - podman = config.profile.podman; - cache = "/home/${user.name}/.cache/podman/caddy"; -in -{ - config = lib.mkIf (podman.enable && podman.caddy.enable) { - system.activationScripts.podman-caddy = '' - mkdir -p ${cache} - chown -R ${config.profile.user.name} ${cache} - ''; - # https://fictionbecomesfact.com/caddy-container - systemd.services.create-caddy-network = with config.virtualisation.oci-containers; { - serviceConfig.Type = "oneshot"; - wantedBy = [ "${backend}-caddy.service" ]; - script = ''${pkgs.podman}/bin/podman network exists caddy || ${pkgs.podman}/bin/podman network create caddy''; - }; - virtualisation.oci-containers.containers = { - caddy = { - image = "lucaslorentz/caddy-docker-proxy:ci-alpine"; - environment = { - TZ = "Asia/Jakarta"; - }; - ports = [ "80:80" "443:443" ]; - autoStart = true; - volumes = [ - "/run/user/${toString(user.uid)}/podman/podman.sock:/var/run/docker.sock:z" - "${cache}:/data" - ]; - extraOptions = [ - "--network=caddy" - ]; - }; - }; - }; -} diff --git a/system/podman/default.nix b/system/podman/default.nix index 45c0709..c4fc0fb 100644 --- a/system/podman/default.nix +++ b/system/podman/default.nix @@ -41,11 +41,10 @@ in # 10.88.0.6 -> Suwayomi Flaresolverr # 10.88.1.1 -> Pihole imports = [ - ./caddy.nix ./pihole.nix + ./redmage-demo.nix + ./redmage.nix ./suwayomi.nix ./ytptube.nix - ./redmage.nix - ./redmage-demo.nix ]; }