From 55bec881c33bc087063f145a5d2f2e732cac4970 Mon Sep 17 00:00:00 2001 From: rope Date: Fri, 10 Jul 2026 23:14:44 +0100 Subject: [PATCH] Comment out 7DTD servers, not in use Co-Authored-By: Claude Fable 5 --- ports.toml | 39 +++-- services/authelia.nix | 2 +- services/game-servers.nix | 357 +++++++++++++++++++------------------- services/nginx.nix | 2 +- 4 files changed, 202 insertions(+), 198 deletions(-) diff --git a/ports.toml b/ports.toml index 3cf5547..8bc7650 100644 --- a/ports.toml +++ b/ports.toml @@ -25,25 +25,26 @@ name = "SSH" port = 22 protocol = "tcp" -[[forward]] -name = "7DTD game" -port = 26900 -protocol = "both" - -[[forward]] -name = "7DTD voice/dynamic" -ports = "26901-26902" -protocol = "udp" - -[[forward]] -name = "7DTD-coop game" -port = 26910 -protocol = "both" - -[[forward]] -name = "7DTD-coop voice/dynamic" -ports = "26911-26912" -protocol = "udp" +# 7DTD forwards commented out — servers disabled in services/game-servers.nix. +# [[forward]] +# name = "7DTD game" +# port = 26900 +# protocol = "both" +# +# [[forward]] +# name = "7DTD voice/dynamic" +# ports = "26901-26902" +# protocol = "udp" +# +# [[forward]] +# name = "7DTD-coop game" +# port = 26910 +# protocol = "both" +# +# [[forward]] +# name = "7DTD-coop voice/dynamic" +# ports = "26911-26912" +# protocol = "udp" [[forward]] name = "Neko WebRTC" diff --git a/services/authelia.nix b/services/authelia.nix index 0d3f0f7..d5cabe1 100644 --- a/services/authelia.nix +++ b/services/authelia.nix @@ -30,7 +30,7 @@ { domain = "frigate.nordhammer.it"; policy = "one_factor"; } { domain = "camera.nordhammer.it"; policy = "one_factor"; } { domain = "homepage.nordhammer.it"; policy = "one_factor"; } - { domain = "7dtd.nordhammer.it"; policy = "one_factor"; } + # { domain = "7dtd.nordhammer.it"; policy = "one_factor"; } # 7DTD disabled { domain = "adguard.nordhammer.it"; policy = "one_factor"; } { domain = "sonarr.nordhammer.it"; policy = "one_factor"; } { domain = "radarr.nordhammer.it"; policy = "one_factor"; } diff --git a/services/game-servers.nix b/services/game-servers.nix index a3632c0..0df3685 100644 --- a/services/game-servers.nix +++ b/services/game-servers.nix @@ -1,191 +1,194 @@ { config, pkgs, lib, ... }: { config = lib.mkIf (config.networking.hostName == "FredOS-Mediaserver") { + # Kept even with 7DTD commented out: memos/profilarr containers rely on these. virtualisation.docker.enable = true; - - systemd.tmpfiles.rules = [ - "d /var/lib/7dtd 0755 root root -" - "d /var/lib/7dtd/saves 0755 root root -" - "d /var/lib/7dtd/serverfiles 0755 root root -" - "d /var/lib/7dtd/lgsm 0755 root root -" - "d /var/lib/7dtd/log 0755 root root -" - "d /var/lib/7dtd/backups 0755 root root -" - "d /var/lib/7dtd-coop 0755 root root -" - "d /var/lib/7dtd-coop/saves 0755 root root -" - "d /var/lib/7dtd-coop/serverfiles 0755 root root -" - "d /var/lib/7dtd-coop/lgsm 0755 root root -" - "d /var/lib/7dtd-coop/log 0755 root root -" - "d /var/lib/7dtd-coop/backups 0755 root root -" - ]; + virtualisation.oci-containers.backend = "docker"; ## <----- 7 DAYS TO DIE ----> ## - virtualisation.oci-containers = { - backend = "docker"; - containers."7dtd" = { - image = "vinanrra/7dtd-server:latest"; - volumes = [ - "/var/lib/7dtd/saves:/home/sdtdserver/.local/share/7DaysToDie" - "/var/lib/7dtd/serverfiles:/home/sdtdserver/serverfiles" - "/var/lib/7dtd/lgsm:/home/sdtdserver/lgsm/config-lgsm/sdtdserver" - "/var/lib/7dtd/log:/home/sdtdserver/log" - "/var/lib/7dtd/backups:/home/sdtdserver/lgsm/backup" - ]; - ports = [ - "26900:26900/tcp" - "26900:26900/udp" - "26901:26901/udp" - "26902:26902/udp" - # WebDashboard — localhost-only; nginx reverse-proxies it with Authelia - "127.0.0.1:8090:8080/tcp" - ]; - environment = { - START_MODE = "1"; - VERSION = "stable"; - TimeZone = "Europe/Stockholm"; - TEST_ALERT = "NO"; - }; - }; + # Commented out 2026-07 — servers not in regular use. Saves remain in + # /var/lib/7dtd{,-coop}; uncomment below (and forwards in ports.toml) + # to bring them back. - containers."7dtd-coop" = { - image = "vinanrra/7dtd-server:latest"; - volumes = [ - "/var/lib/7dtd-coop/saves:/home/sdtdserver/.local/share/7DaysToDie" - "/var/lib/7dtd-coop/serverfiles:/home/sdtdserver/serverfiles" - "/var/lib/7dtd-coop/lgsm:/home/sdtdserver/lgsm/config-lgsm/sdtdserver" - "/var/lib/7dtd-coop/log:/home/sdtdserver/log" - "/var/lib/7dtd-coop/backups:/home/sdtdserver/lgsm/backup" - ]; - ports = [ - "26910:26900/tcp" - "26910:26900/udp" - "26911:26901/udp" - "26912:26902/udp" - "127.0.0.1:8091:8080/tcp" - ]; - environment = { - # Start-only. Serverfiles are seeded by rsync from the main 7dtd - # install — SteamCMD anonymous install fails on a fresh dir, so - # we share the binaries and skip the update path here. (Mode 2 - # is "Update + STOP", mode 0/2/4 all stop after their action.) - START_MODE = "1"; - VERSION = "stable"; - TimeZone = "Europe/Stockholm"; - TEST_ALERT = "NO"; - }; - }; - }; + # systemd.tmpfiles.rules = [ + # "d /var/lib/7dtd 0755 root root -" + # "d /var/lib/7dtd/saves 0755 root root -" + # "d /var/lib/7dtd/serverfiles 0755 root root -" + # "d /var/lib/7dtd/lgsm 0755 root root -" + # "d /var/lib/7dtd/log 0755 root root -" + # "d /var/lib/7dtd/backups 0755 root root -" + # "d /var/lib/7dtd-coop 0755 root root -" + # "d /var/lib/7dtd-coop/saves 0755 root root -" + # "d /var/lib/7dtd-coop/serverfiles 0755 root root -" + # "d /var/lib/7dtd-coop/lgsm 0755 root root -" + # "d /var/lib/7dtd-coop/log 0755 root root -" + # "d /var/lib/7dtd-coop/backups 0755 root root -" + # ]; - systemd.services."7dtd-configure" = { - description = "Patch 7DTD sdtdserver.xml on first install"; - after = [ "docker-7dtd.service" ]; - wants = [ "docker-7dtd.service" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ gnused coreutils systemd ]; - script = '' - MARKER=/var/lib/7dtd/.configured - CONFIG=/var/lib/7dtd/serverfiles/sdtdserver.xml - if [ -f "$MARKER" ]; then - echo "Already configured; skipping." - exit 0 - fi - echo "Waiting for $CONFIG (install can take 15+ minutes on first boot)..." - for i in $(seq 1 180); do - [ -f "$CONFIG" ] && break - sleep 10 - done - if [ ! -f "$CONFIG" ]; then - echo "Timed out waiting for $CONFIG; will retry next boot." - exit 1 - fi + # virtualisation.oci-containers.containers."7dtd" = { + # image = "vinanrra/7dtd-server:latest"; + # volumes = [ + # "/var/lib/7dtd/saves:/home/sdtdserver/.local/share/7DaysToDie" + # "/var/lib/7dtd/serverfiles:/home/sdtdserver/serverfiles" + # "/var/lib/7dtd/lgsm:/home/sdtdserver/lgsm/config-lgsm/sdtdserver" + # "/var/lib/7dtd/log:/home/sdtdserver/log" + # "/var/lib/7dtd/backups:/home/sdtdserver/lgsm/backup" + # ]; + # ports = [ + # "26900:26900/tcp" + # "26900:26900/udp" + # "26901:26901/udp" + # "26902:26902/udp" + # # WebDashboard — localhost-only; nginx reverse-proxies it with Authelia + # "127.0.0.1:8090:8080/tcp" + # ]; + # environment = { + # START_MODE = "1"; + # VERSION = "stable"; + # TimeZone = "Europe/Stockholm"; + # TEST_ALERT = "NO"; + # }; + # }; - set_prop() { - sed -i "s|