This commit is contained in:
admin 2026-03-01 22:35:46 +00:00
parent 8fd3a086af
commit 25ebaf181c
2 changed files with 72 additions and 91 deletions

View File

@ -85,32 +85,6 @@
}; };
}; };
caddy = {
image = "docker.io/caddy";
autoStart = true;
autoUpdate = "registry";
network = "vlan50_web";
environmentFile = [
"/pool/services/secrets/default"
];
volumes = [
"/pool/services/podman/caddy/conf:/etc/caddy"
"/pool/services/podman/caddy/site:/srv"
"/pool/services/podman/caddy/data:/data"
"/pool/services/podman/caddy/config:/config"
];
ports = [
"80:80"
"443:443"
"443:443/udp"
];
extraConfig = {
Service = {
TimeoutStartSec = 900;
};
};
};
bazarr = { bazarr = {
image = "lscr.io/linuxserver/bazarr:latest"; image = "lscr.io/linuxserver/bazarr:latest";
autoStart = true; autoStart = true;
@ -326,29 +300,6 @@
}; };
}; };
hugo = {
image = "docker.io/hugomods/hugo:latest";
autoStart = true;
autoUpdate = "registry";
network = "vlan50_web";
exec = "server -s /src/mektem.com -D";
environmentFile = [
"/pool/services/secrets/default"
];
volumes = [
"/pool/services/podman/hugo/src:/src"
"/pool/services/podman/hugo/cache:/tmp/hugo_cache"
];
ports = [
"1313:1313"
];
extraConfig = {
Service = {
TimeoutStartSec = 900;
};
};
};
immich-db = { immich-db = {
image = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52"; image = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52";
autoStart = true; autoStart = true;
@ -703,21 +654,32 @@
}; };
}; };
# nginx = { # nginx-anubis = {
# image = "docker.io/nginx:latest"; # image = "ghcr.io/techarohq/anubis:latest";
# autoStart = true; # autoStart = true;
# autoUpdate = "registry"; # autoUpdate = "registry";
# network = "vlan50"; # network = "vlan50_web";
# environmentFile = [ # environmentFile = [
# "/pool/services/secrets/default" # "/pool/services/secrets/default"
# "/pool/services/secrets/nginx" # "/pool/services/secrets/anubis-default" #WHY DOES THIS NOT WORK????
# "/pool/services/secrets/anubis-nginx"
# ]; # ];
# environment = {
# DIFFICULTY = "4";
# SERVE_ROBOTS_TXT = "true";
# POLICY_FNAME = "/data/cfg/botPolicy.json";
# OG_PASSTHROUGH = "true";
# OG_EXPIRY_TIME = "24h";
# BIND = ":8881";
# METRICS_BIND = ":9090";
# TARGET = "http://192.168.0.30:888";
# };
# volumes = [ # volumes = [
# "/pool/services/podman/nginx/nginx.conf:/etc/nginx/nginx.conf:ro" # "/pool/services/podman/anubis/botPolicy.json:/data/cfg/botPolicy.json:ro"
# "/pool/services/podman/hugo/src/mektem.com/public:/usr/share/nginx/html"
# ]; # ];
# ports = [ # ports = [
# "888:80" # "8881:8881"
# ]; # ];
# extraConfig = { # extraConfig = {
# Service = { # Service = {
@ -726,40 +688,6 @@
# }; # };
# }; # };
nginx-anubis = {
image = "ghcr.io/techarohq/anubis:latest";
autoStart = true;
autoUpdate = "registry";
network = "vlan50_web";
environmentFile = [
"/pool/services/secrets/default"
"/pool/services/secrets/anubis-default" #WHY DOES THIS NOT WORK????
"/pool/services/secrets/anubis-nginx"
];
environment = {
DIFFICULTY = "4";
SERVE_ROBOTS_TXT = "true";
POLICY_FNAME = "/data/cfg/botPolicy.json";
OG_PASSTHROUGH = "true";
OG_EXPIRY_TIME = "24h";
BIND = ":8881";
METRICS_BIND = ":9090";
TARGET = "http://192.168.0.30:888";
};
volumes = [
"/pool/services/podman/anubis/botPolicy.json:/data/cfg/botPolicy.json:ro"
];
ports = [
"8881:8881"
];
extraConfig = {
Service = {
TimeoutStartSec = 900;
};
};
};
#nginx-proxy-manager = { #nginx-proxy-manager = {
# image = "docker.io/jc21/nginx-proxy-manager:2.9.22"; # image = "docker.io/jc21/nginx-proxy-manager:2.9.22";
# autoStart = true; # autoStart = true;

View File

@ -210,6 +210,30 @@ systemd.services.podman-network-vlan50 = {
}; };
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
caddy = {
image = "docker.io/caddy";
autoStart = true;
#autoUpdate = "registry";
network = [ "vlan50" ];
environmentFile = [
"/pool/services/secrets/default"
];
volumes = [
"/pool/services/podman/caddy/conf:/etc/caddy"
"/pool/services/podman/caddy/site:/srv"
"/pool/services/podman/caddy/data:/data"
"/pool/services/podman/caddy/config:/config"
];
extraOptions = [
"--ip=192.168.50.31"
];
# extraConfig = {
# Service = {
# TimeoutStartSec = 900;
# };
# };
};
nginx = { nginx = {
image = "docker.io/nginx:latest"; image = "docker.io/nginx:latest";
autoStart = true; autoStart = true;
@ -224,9 +248,38 @@ systemd.services.podman-network-vlan50 = {
"/pool/services/podman/hugo/src/mektem.com/public:/usr/share/nginx/html" "/pool/services/podman/hugo/src/mektem.com/public:/usr/share/nginx/html"
]; ];
extraOptions = [ extraOptions = [
"--ip=192.168.50.31" "--ip=192.168.50.33"
]; ];
# extraConfig = {
# Service = {
# TimeoutStartSec = 900;
# };
# };
}; };
hugo = {
image = "docker.io/hugomods/hugo:latest";
autoStart = true;
#autoUpdate = "registry";
networks = [ "vlan50_web" ];
cmd = "server -s /src/mektem.com -D";
environmentFiles = [
"/pool/services/secrets/default"
];
volumes = [
"/pool/services/podman/hugo/src:/src"
"/pool/services/podman/hugo/cache:/tmp/hugo_cache"
];
extraOptions = [
"--ip=192.168.50.32"
];
# extraConfig = {
# Service = {
# TimeoutStartSec = 900;
# };
# };
};
}; };
system.stateVersion = "24.11"; system.stateVersion = "24.11";