From 46b7cd3116f9d36f24fc482c3dab7590b9e388e2 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Fri, 31 Jan 2025 22:30:10 -0800 Subject: [PATCH] Enhancement: Rename `DOCKER_DATA` to runtime-neutral `APPDATA` --- homelab/stacks/send/docker-compose.yml | 2 +- homelab/stacks/send/stack.nix | 3 +-- homelab/stacks/traefik/docker-compose.yml | 4 ++-- homelab/stacks/traefik/stack.nix | 11 +---------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/homelab/stacks/send/docker-compose.yml b/homelab/stacks/send/docker-compose.yml index 19cc2e70..1223202f 100644 --- a/homelab/stacks/send/docker-compose.yml +++ b/homelab/stacks/send/docker-compose.yml @@ -18,7 +18,7 @@ services: FILE_DIR: /uploads MAX_FILE_SIZE: 42949672960 # 40 GiB volumes: - - ${DOCKER_DATA}/uploads:/uploads + - ${APPDATA}/uploads:/uploads labels: - traefik.http.routers.send.rule=Host(`send.jafner.net`) - traefik.http.routers.send.tls.certresolver=lets-encrypt-dns01 diff --git a/homelab/stacks/send/stack.nix b/homelab/stacks/send/stack.nix index eafd7a1a..28940fe8 100644 --- a/homelab/stacks/send/stack.nix +++ b/homelab/stacks/send/stack.nix @@ -8,9 +8,8 @@ }; "${stack}/.env" = { enable = true; - text = ''DOCKER_DATA=${sys.dockerData}''; + text = ''APPDATA=${sys.dataDirs.appdata}''; target = "stacks/${stack}/.env"; }; }; - #home-manager.users."${sys.username}".systemd.user.services."${stack}" = {}; } \ No newline at end of file diff --git a/homelab/stacks/traefik/docker-compose.yml b/homelab/stacks/traefik/docker-compose.yml index 5c2f145a..0f06168c 100644 --- a/homelab/stacks/traefik/docker-compose.yml +++ b/homelab/stacks/traefik/docker-compose.yml @@ -15,8 +15,8 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - ./traefik.yaml:/traefik.yaml - ./config:/config - - $DOCKER_DATA/acme.json:/acme.json - - $DOCKER_DATA/acme-dns01.json:/acme-dns01.json + - $APPDATA/acme.json:/acme.json + - $APPDATA/acme-dns01.json:/acme-dns01.json env_file: - path: /run/secrets/traefik required: true diff --git a/homelab/stacks/traefik/stack.nix b/homelab/stacks/traefik/stack.nix index 4d83b8d9..387326e3 100644 --- a/homelab/stacks/traefik/stack.nix +++ b/homelab/stacks/traefik/stack.nix @@ -8,23 +8,14 @@ }; "${stack}/.env" = { enable = true; - text = ''DOCKER_DATA=${sys.dockerData}''; + text = ''APPDATA=${sys.dataDirs.appdata}''; target = "stacks/${stack}/.env"; }; }; - - #imports = [ inputs.sops-nix.nixosModules.sops ]; sops.secrets."${stack}" = { sopsFile = ./secrets.env; key = ""; mode = "0440"; owner = sys.username; - # Access this secrets file in Nix expressions via: - # config.sops.secrets.traefik.path - # Or in sops-nix templates via: - # config.sops.placeholder.traefik.path - # Or in the shell via: - # cat /run/secrets/traefik }; - #home-manager.users."${sys.username}".systemd.user.services."${stack}" = {}; } \ No newline at end of file