Compare commits
5 Commits
19f38e2634
...
4a75307017
| Author | SHA1 | Date | |
|---|---|---|---|
| 4a75307017 | |||
| 91c1bf7d1f | |||
| d73a0a3c46 | |||
| 27e0a5f76e | |||
| 1232b67b67 |
@ -18,6 +18,7 @@
|
||||
# My own stuff
|
||||
./services/airsignal.nix
|
||||
./services/heidi.nix
|
||||
./services/formula10.nix
|
||||
|
||||
# General
|
||||
./services/authelia.nix
|
||||
@ -27,7 +28,6 @@
|
||||
./services/homepage.nix
|
||||
./services/immich.nix
|
||||
./services/kopia.nix
|
||||
./services/memos.nix
|
||||
./services/nextcloud.nix
|
||||
./services/nginx-proxy-manager.nix
|
||||
./services/portainer.nix
|
||||
@ -103,6 +103,8 @@
|
||||
defaultGateway = "192.168.86.5";
|
||||
nameservers = [
|
||||
"127.0.0.1"
|
||||
# "192.168.86.25"
|
||||
# "8.8.8.8"
|
||||
];
|
||||
};
|
||||
|
||||
@ -120,6 +122,10 @@
|
||||
# crash the whole service.
|
||||
check=$(${dockercli} network ls | grep ${network} || true)
|
||||
if [ -z "$check" ]; then
|
||||
# TODO: Disable IP masquerading to show individual containers in AdGuard/Pi-Hole
|
||||
# - Disabling this prevents containers from having internet connection. DNS issue?
|
||||
# ${dockercli} network create -o "com.docker.network.bridge.enable_ip_masquerade"="false" ${network}
|
||||
|
||||
${dockercli} network create ${network}
|
||||
else
|
||||
echo "${network} already exists in docker"
|
||||
@ -220,6 +226,17 @@
|
||||
# enable = true;
|
||||
# setSocketVariable = true;
|
||||
# };
|
||||
daemon.settings = {
|
||||
dns = [
|
||||
# TODO: Does this circumvent my DNS for each container?
|
||||
# It might improve gitea actions though...
|
||||
"8.8.8.8"
|
||||
|
||||
# TODO: Might prevent containers from having DNS?
|
||||
# "127.0.0.1"
|
||||
# "192.168.86.25"
|
||||
];
|
||||
};
|
||||
};
|
||||
oci-containers.backend = "docker";
|
||||
};
|
||||
@ -272,6 +289,8 @@
|
||||
|
||||
ntp.enable = true;
|
||||
qemuGuest.enable = true;
|
||||
# TODO: Might prevent containers from having working DNS
|
||||
# resolved.fallbackDns = ["8.8.8.8"];
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"/media/Stash-Usenet/metube:/downloads"
|
||||
"/media/Stash-Video:/downloads"
|
||||
];
|
||||
|
||||
environment = {
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"/media/Stash-Usenet:/downloads"
|
||||
"/media/Stash-Video:/downloads"
|
||||
|
||||
"box-sabnzbd_config:/config"
|
||||
];
|
||||
|
||||
28
ServeNix/services/formula10.nix
Normal file
28
ServeNix/services/formula10.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
virtualisation.oci-containers.containers.formula10 = {
|
||||
image = "gitea.vps.chriphost.de/christoph/formula10:latest";
|
||||
autoStart = true;
|
||||
|
||||
dependsOn = [];
|
||||
|
||||
ports = [
|
||||
"55555:5000"
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"formula10_data:/app/instance"
|
||||
];
|
||||
|
||||
environment = {};
|
||||
|
||||
extraOptions = [
|
||||
"--init" # Make an init process take up PID 1, to make python receive the SIGTERM
|
||||
"--net=behind-nginx"
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
dependsOn = [];
|
||||
|
||||
ports = [
|
||||
# "8123:8123" # WebUI
|
||||
"8123:8123" # WebUI
|
||||
];
|
||||
|
||||
volumes = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
...
|
||||
}: {
|
||||
virtualisation.oci-containers.containers.immich-database = {
|
||||
image = "postgres:15";
|
||||
image = "tensorchord/pgvecto-rs:pg15-v0.2.0";
|
||||
autoStart = true;
|
||||
|
||||
dependsOn = [];
|
||||
@ -85,8 +85,6 @@
|
||||
|
||||
MACHINE_LEARNING_WORKERS = "1";
|
||||
MACHINE_LEARNING_WORKER_TIMEOUT = "120";
|
||||
DISABLE_MACHINE_LEARNING = "false";
|
||||
DISABLE_TYPESENSE = "false";
|
||||
};
|
||||
|
||||
extraOptions = [
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
"box-stash_generated:/data/box-stash_generated:ro"
|
||||
"box-stash_metadata:/data/box-stash_metadata:ro"
|
||||
"fileflows_config:/data/fileflows_config:ro"
|
||||
"formula10_data:/data/formula10_data:ro"
|
||||
"gitea-db_data:/data/gitea-db_data:ro"
|
||||
"gitea-runner_config:/data/gitea-runner_config:ro"
|
||||
"gitea-runner_data:/data/gitea-runner_data:ro"
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
virtualisation.oci-containers.containers.memos = {
|
||||
image = "ghcr.io/usememos/memos:latest";
|
||||
autoStart = true;
|
||||
|
||||
dependsOn = [];
|
||||
|
||||
ports = [
|
||||
"5230:5230"
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"memos_data:/var/opt/memos"
|
||||
];
|
||||
|
||||
environment = {};
|
||||
|
||||
extraOptions = [
|
||||
"--net=behind-nginx"
|
||||
];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user