diff --git a/containers/freshrss/default.nix b/containers/freshrss/default.nix index 5ee2e1e..3854a8e 100644 --- a/containers/freshrss/default.nix +++ b/containers/freshrss/default.nix @@ -1,12 +1,12 @@ -{ ... }: +{ lib, ... }: let - directories = [ - "/opt/freshrss" - ]; + directory = "/opt/freshrss"; port = "8888"; in { - systemd.tmpfiles.rules = map (x: "d ${x} 0755 share share - -") directories; + systemd.tmpfiles.rules = + map (x: "d ${x} 0755 share share - -") (lib.lists.singleton directory); + virtualisation.oci-containers.containers.freshrss = { image = "freshrss/freshrss:latest"; autoStart = true; @@ -14,8 +14,8 @@ in "${port}:80" ]; volumes = [ - "/opt/freshrss/data:/var/www/FreshRSS/data" - "/opt/freshrss/extensions:/var/www/FreshRSS/extensions" + "${directory}/data:/var/www/FreshRSS/data" + "${directory}/extensions:/var/www/FreshRSS/extensions" ]; environment = { TZ = "America/Detroit"; @@ -23,7 +23,7 @@ in }; }; - services.caddy.virtualHosts."newspaper.tdback.net".extraConfig = '' + services.caddy.virtualHosts."fresh.brownbread.net".extraConfig = '' encode zstd gzip reverse_proxy http://localhost:${port} ''; diff --git a/containers/jellyfin/default.nix b/containers/jellyfin/default.nix index b8aea0e..96b6deb 100644 --- a/containers/jellyfin/default.nix +++ b/containers/jellyfin/default.nix @@ -1,11 +1,11 @@ -{ ... }: +{ lib, ... }: let - directories = [ - "/opt/jellyfin" - ]; + directory = "/opt/jellyfin"; in { - systemd.tmpfiles.rules = map (x: "d ${x} 0755 share share - -") directories; + systemd.tmpfiles.rules = + map (x: "d ${x} 0755 share share - -") (lib.lists.singleton directory); + virtualisation.oci-containers.containers.jellyfin = { image = "jellyfin/jellyfin:latest"; autoStart = true; @@ -14,13 +14,13 @@ in "8096:8096/tcp" ]; volumes = [ - "/opt/jellyfin/config:/config" - "/opt/jellyfin/cache:/cache" + "${directory}/config:/config" + "${directory}/cache:/cache" "/lagoon/media:/media" ]; }; - services.caddy.virtualHosts."jellyfin.tdback.net".extraConfig = '' + services.caddy.virtualHosts."buttered.brownbread.net".extraConfig = '' encode zstd gzip reverse_proxy http://localhost:8096 ''; diff --git a/containers/navidrome/default.nix b/containers/navidrome/default.nix index af8160c..d98117b 100644 --- a/containers/navidrome/default.nix +++ b/containers/navidrome/default.nix @@ -1,11 +1,11 @@ -{ ... }: +{ lib, ... }: let - directories = [ - "/opt/navidrome" - ]; + directory = "/opt/navidrome"; in { - systemd.tmpfiles.rules = map (x: "d ${x} 0755 share share - -") directories; + systemd.tmpfiles.rules = + map (x: "d ${x} 0755 share share - -") (lib.lists.singleton directory); + virtualisation.oci-containers.containers.navidrome = { image = "deluan/navidrome:latest"; autoStart = true; @@ -13,7 +13,7 @@ in "4533:4533" ]; volumes = [ - "/opt/navidrome/data:/data" + "${directory}/data:/data" "/lagoon/media/music:/music:ro" ]; environment = { @@ -24,7 +24,7 @@ in }; }; - services.caddy.virtualHosts."radio.tdback.net".extraConfig = '' + services.caddy.virtualHosts."radioactive.brownbread.net".extraConfig = '' encode zstd gzip reverse_proxy http://localhost:4533 ''; diff --git a/containers/vaultwarden/default.nix b/containers/vaultwarden/default.nix index ba7ed30..4f5092a 100644 --- a/containers/vaultwarden/default.nix +++ b/containers/vaultwarden/default.nix @@ -1,6 +1,6 @@ { lib, ... }: let - domain = "crypt.tdback.net"; + domain = "steelmountain.brownbread.net"; port = "11001"; directory = "/opt/vaultwarden"; in diff --git a/modules/mealie/default.nix b/modules/mealie/default.nix index b6c8d07..2d869ce 100644 --- a/modules/mealie/default.nix +++ b/modules/mealie/default.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - domain = "mealie.tdback.net"; + domain = "toasted.brownbread.net"; in { services.mealie = { diff --git a/modules/sftpgo/default.nix b/modules/sftpgo/default.nix index 264f78d..27318b2 100644 --- a/modules/sftpgo/default.nix +++ b/modules/sftpgo/default.nix @@ -13,7 +13,7 @@ }; }; - services.caddy.virtualHosts."${config.networking.hostName}.tdback.net".extraConfig = '' + services.caddy.virtualHosts."${config.networking.hostName}.brownbread.net".extraConfig = '' root * /web/client encode zstd gzip reverse_proxy http://localhost:8080