From 6eeace47ecf913d799b87bdf25a51b2496a14b54 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 15 Nov 2024 23:00:00 +0100 Subject: [PATCH] adds various docker services --- config/nixos/docker/default.nix | 9 ++++++++- config/nixos/docker/gitea/docker-compose.yml | 4 ++-- config/nixos/docker/sabnzbd/docker-compose.yml | 2 +- config/nixos/docker/stash/docker-compose.yml | 10 +++++----- config/nixos/docker/torrent/docker-compose.yml | 4 ++-- config/nixos/docker/wireguard/docker-compose.yml | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/config/nixos/docker/default.nix b/config/nixos/docker/default.nix index 9ad1f4c..0344275 100644 --- a/config/nixos/docker/default.nix +++ b/config/nixos/docker/default.nix @@ -1,6 +1,13 @@ { ... }: { - imports = [ ./minecraft.nix ]; + imports = [ + ./minecraft.nix + ./wireguard.nix + ./torrent.nix + ./stash.nix + ./sabnzbd.nix + ./gitea.nix + ]; } # TODO: Import all the package modules, disabled for testing one by one. # { config, pkgs, ... }: diff --git a/config/nixos/docker/gitea/docker-compose.yml b/config/nixos/docker/gitea/docker-compose.yml index 7933041..fa47f93 100644 --- a/config/nixos/docker/gitea/docker-compose.yml +++ b/config/nixos/docker/gitea/docker-compose.yml @@ -16,7 +16,7 @@ services: image: gitea/gitea:latest restart: always volumes: - - ./data/gittea:/data + - /mnt/services/gitea/gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -33,7 +33,7 @@ services: - POSTGRES_PASSWORD=gitea - POSTGRES_DB=gitea volumes: - - ./data/postgres:/var/lib/postgresql/data + - /mnt/services/gitea/postgres:/var/lib/postgresql/data networks: - net diff --git a/config/nixos/docker/sabnzbd/docker-compose.yml b/config/nixos/docker/sabnzbd/docker-compose.yml index b9f7cfb..048e9bc 100644 --- a/config/nixos/docker/sabnzbd/docker-compose.yml +++ b/config/nixos/docker/sabnzbd/docker-compose.yml @@ -5,7 +5,7 @@ services: environment: - TZ=Europe/Amsterdam volumes: - - ./data:/config + - /mnt/services/sabnzbd:/config - /mnt:/storage ports: - 7788:8080 diff --git a/config/nixos/docker/stash/docker-compose.yml b/config/nixos/docker/stash/docker-compose.yml index 82cd87c..a1466d3 100644 --- a/config/nixos/docker/stash/docker-compose.yml +++ b/config/nixos/docker/stash/docker-compose.yml @@ -15,14 +15,14 @@ services: - /etc/localtime:/etc/localtime:ro ## Keep configs, scrapers, and plugins here. - - ./data/config:/root/.stash + - /mnt/services/stash/config:/root/.stash ## Point this at your collection. - /mnt/stash:/data ## This is where your stash's metadata lives - - ./data/metadata:/metadata + - /mnt/services/stash/metadata:/metadata ## Any other cache content. - - ./data/cache:/cache + - /mnt/services/stash/cache:/cache ## Where to store binary blob data (scene covers, images) - - ./data/blobs:/blobs + - /mnt/services/stash/blobs:/blobs ## Where to store generated content (screenshots,previews,transcodes,sprites) - - ./data/generated:/generated + - /mnt/services/stash/generated:/generated diff --git a/config/nixos/docker/torrent/docker-compose.yml b/config/nixos/docker/torrent/docker-compose.yml index b2aecec..1fdc839 100644 --- a/config/nixos/docker/torrent/docker-compose.yml +++ b/config/nixos/docker/torrent/docker-compose.yml @@ -10,7 +10,7 @@ services: - 6881:6881/udp - 8085:8085 volumes: - - ./data/gluetun:/gluetun + - /mnt/services/torrent/gluetun:/gluetun environment: - VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER} - OPENVPN_USER=${OPENVPN_USER} @@ -28,7 +28,7 @@ services: - WEBUI_PORT=8085 volumes: - "/etc/localtime:/etc/localtime:ro" - - ./data/qbit:/config + - /mnt/services/torrent/qbit-config:/config - /mnt:/storage depends_on: - gluetun diff --git a/config/nixos/docker/wireguard/docker-compose.yml b/config/nixos/docker/wireguard/docker-compose.yml index c2c323f..1baf58c 100644 --- a/config/nixos/docker/wireguard/docker-compose.yml +++ b/config/nixos/docker/wireguard/docker-compose.yml @@ -19,7 +19,7 @@ services: environment: - PEERS=s24,pc,laptop volumes: - - ./data:/config + - /mnt/services/wireguard/data:/config ports: - 51820:51820/udp sysctls: