This commit is contained in:
Lucy Hochkamp 2025-09-03 22:30:27 +02:00
parent 6207e4227c
commit 9983854936
No known key found for this signature in database
4 changed files with 18 additions and 13 deletions

View file

@ -76,7 +76,7 @@ in
"--health-cmd" "--health-cmd"
"pg_isready -U postgres" "pg_isready -U postgres"
]; ];
dependsOn = [ "db-network" ]; # dependsOn = [ "db-network" ];
environment = { environment = {
POSTGRES_INITDB_ARGS = "--data-checksums"; POSTGRES_INITDB_ARGS = "--data-checksums";
}; };
@ -91,13 +91,13 @@ in
}; };
# immich # immich
ragon.agenix.secrets.ds9ImmichEnv = { }; ragon.agenix.secrets.ds9ImmichEnv = { };
systemd.services."podman-immich-network" = { # systemd.services."podman-immich-network" = {
script = '' # script = ''
echo "Creating immich network" # echo "Creating immich network"
${pkgs.podman}/bin/podman network exists immich-net || ${pkgs.podman}/bin/podman network create immich-net --internal --ipv6 # ${pkgs.podman}/bin/podman network exists immich-net || ${pkgs.podman}/bin/podman network create immich-net --internal --ipv6
echo "Created immich network" # echo "Created immich network"
''; # '';
}; # };
virtualisation.oci-containers.containers.immich-redis = { virtualisation.oci-containers.containers.immich-redis = {
image = "docker.io/valkey/valkey:7.2.6-alpine"; image = "docker.io/valkey/valkey:7.2.6-alpine";
environment.TZ = "Europe/Berlin"; environment.TZ = "Europe/Berlin";
@ -109,7 +109,7 @@ in
environmentFiles = [ environmentFiles = [
config.age.secrets.ds9ImmichEnv.path config.age.secrets.ds9ImmichEnv.path
]; ];
dependsOn = [ "immich-network" ]; # dependsOn = [ "immich-network" ];
}; };
virtualisation.oci-containers.containers.immich-server = { virtualisation.oci-containers.containers.immich-server = {
user = "1000:100"; user = "1000:100";
@ -120,7 +120,7 @@ in
"--network=db-net" "--network=db-net"
]; ];
dependsOn = [ dependsOn = [
"immich-network" # "immich-network"
"immich-redis" "immich-redis"
"postgres" "postgres"
]; ];
@ -147,7 +147,7 @@ in
"--network=podman" "--network=podman"
]; ];
dependsOn = [ dependsOn = [
"immich-network" # "immich-network"
"immich-redis" "immich-redis"
"postgres" "postgres"
]; ];

View file

@ -225,6 +225,10 @@ in
output file ${config.services.caddy.logDir}/access-*hailsatan.eu_internet.log output file ${config.services.caddy.logDir}/access-*hailsatan.eu_internet.log
''; '';
virtualHosts."*.hailsatan.eu ".extraConfig = '' virtualHosts."*.hailsatan.eu ".extraConfig = ''
@vanitygpg host vanitygpg.hailsatan.eu
handle @vanitygpg {
reverse_proxy h2c://[::1]:29328
}
import blockBots import blockBots
@jellyfin host j.hailsatan.eu @jellyfin host j.hailsatan.eu
handle @jellyfin { handle @jellyfin {

View file

@ -119,6 +119,7 @@ in
"~Murder Drones" = { "~Murder Drones" = {
s01_url = "https://www.youtube.com/playlist?list=PLHovnlOusNLiJz3sm0d5i2Evwa2LDLdrg"; s01_url = "https://www.youtube.com/playlist?list=PLHovnlOusNLiJz3sm0d5i2Evwa2LDLdrg";
tv_show_collection_episode_ordering = "playlist-index"; tv_show_collection_episode_ordering = "playlist-index";
tv_show_directory = "/data/media/yt";
}; };
}; };
}; };

View file

@ -3,7 +3,7 @@
with pkgs; with pkgs;
caddy.override { caddy.override {
buildGoModule = args: buildGoModule (args // { buildGo125Module = args: buildGo125Module (args // {
src = stdenv.mkDerivation rec { src = stdenv.mkDerivation rec {
pname = "caddy-using-xcaddy-${xcaddy.version}"; pname = "caddy-using-xcaddy-${xcaddy.version}";
inherit (caddy) version; inherit (caddy) version;
@ -37,7 +37,7 @@ caddy.override {
cp -r --reflink=auto . $out cp -r --reflink=auto . $out
''; '';
outputHash = "sha256-r4+WK8UhGLAuIvdV6uiH2bMh/SjTfY4CzKcpHU0Gu5s="; outputHash = "sha256-a2GeG7TYBnCz30jBKQmmQz8Y3vutRpa+tboaahJ5xeQ=";
outputHashMode = "recursive"; outputHashMode = "recursive";
}; };