lib/modules/programs/docker.nix

@@ -30,7 +30,6 @@ in {
               minecraft.enable = mkEnableOption "Minecraft server";
               nextcloud.enable = mkEnableOption "Nextcloud server";
               teamspeak.enable = mkEnableOption "TeamSpeak server";
-              terraria.enable = mkEnableOption "Terraria server";
               trackmania.enable = mkEnableOption "TrackMania server";
               vaultwarden.enable = mkEnableOption "Vaultwarden server";
               woodpecker.enable = mkEnableOption "Woodpecker CI server";

profiles/machines/manuel/server.nix

@@ -62,7 +62,6 @@ in {
             minecraft.enable = true;
             nextcloud.enable = true;
             teamspeak.enable = true;
-            terraria.enable = true;
             trackmania.enable = true;
             vaultwarden.enable = true;
             woodpecker.enable = true;

scripts/Common/Software/docker/services/drone/main.fish

@@ -112,8 +112,8 @@ begin
         printf "%s\0" "$name-ci" /
     end
 
-    function getExtraBackupPatterns
+    function getBackupArgs
-        echo "\.secret\.env\$"
+        printf "%s\n" --hidden --no-ignore "data|\.secret\.|\.overrides\." (getServiceRoot $argv)
     end
 
     runInstaller --force $argv

scripts/Common/Software/docker/services/forgejo/main.fish

@@ -94,5 +94,9 @@ begin
         printf "%s\0" "$_flag_name" /
     end
 
+    function getBackupArgs -V root
+        printf "%s\n" --hidden --no-ignore . --exclude "docker-compose.yml" --exclude "docker-compose.base.yml" (getServiceRoot $argv)
+    end
+
     runInstaller --force $argv
 end

scripts/Common/Software/docker/services/jellyfin/main.fish

@@ -136,8 +136,8 @@ begin
         end
     end
 
-    function getExtraBackupPatterns
+    function getBackupArgs -V root
-        echo "^proton\.env\$"
+        printf "%s\n" --hidden --no-ignore . --exclude "docker-compose.yml" --exclude "docker-compose.base.yml" (getServiceRoot $argv)
     end
 
     runInstaller --force $argv

scripts/Common/Software/docker/services/minecraft/docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - ./mods:/mods
       - ./config/legacy:/config
       - ./data/legacy:/data
+      - ./worlds/legacy:/data/worlds
       - ./legacy.properties:/data/server.properties
   bedrock:
     image: itzg/minecraft-bedrock-server
@@ -27,4 +28,5 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./data/bedrock:/data
+      - ./worlds/bedrock:/data/worlds
       - ./bedrock.properties:/data/server.properties

scripts/Common/Software/docker/services/minecraft/main.fish

@@ -15,7 +15,7 @@ begin
         set -l gid
         set -l file (mktemp)
         set -l root (getServiceRoot $argv)
-        set -l dirs "$root"/{mods,{data,config}/{legacy,bedrock}}
+        set -l dirs "$root"/{mods,{data,config,worlds}/{legacy,bedrock}}
         set -l files "$root"/{legacy,bedrock}.properties
         set -l config "$root/docker-compose.yml"
         configureDockerService $argv
@@ -65,8 +65,8 @@ begin
     function getServiceLocations
     end
 
-    function getExtraBackupPatterns
+    function getBackupArgs
-        echo "\.properties\$|^(config|mods)\$"
+        printf "%s\n" --hidden --no-ignore "config|data|mods|worlds|\.properties\$" --exclude "docker-compose.yml" (getServiceRoot $argv)
     end
 
     runInstaller --force $argv

scripts/Common/Software/docker/services/nextcloud/main.fish

@@ -100,9 +100,5 @@ begin
         printf "%s\0" "$name" /
     end
 
-    function getExtraBackupPatterns
-        echo "^(cache|db|nextcloud)\.env\$"
-    end
-
     runInstaller --force $argv
 end

scripts/Common/Software/docker/services/terraria/docker-compose.base.yml

@@ -1,8 +0,0 @@
-services:
-  terraria:
-    image: ryshe/terraria:latest
-    restart: unless-stopped
-    tty: true
-    stdin_open: true
-    volumes:
-      - ./data:/root/.local/share/Terraria/Worlds

scripts/Common/Software/docker/services/terraria/docker-compose.overrides.yml

@@ -1,8 +0,0 @@
-services:
-  terraria:
-    environment: {}
-    command:
-      -autocreate 1
-      -difficulty 1
-      -seed "AwesomeSeed"
-      -lang "en-US"

scripts/Common/Software/docker/services/terraria/main.fish

@@ -1,24 +0,0 @@
-#!/bin/env fish
-begin
-    set -l dir (status dirname)
-    source "$dir/../service.fish"
-
-    function installSW -V dir
-        set -l root (getServiceRoot $argv)
-        initializeServiceInstallation $argv
-        cp -rf "$dir"/docker-compose{.base,.overrides}.yml "$root"
-        installDockerService $argv
-    end
-
-    function configureSW -V dir
-        configureDockerService $argv
-    end
-
-    function getServiceServers
-    end
-
-    function getServiceLocations
-    end
-
-    runInstaller --force $argv
-end

scripts/Common/Software/docker/services/trackmania/main.fish

@@ -29,8 +29,8 @@ begin
     function getServiceLocations
     end
 
-    function getExtraBackupPatterns
+    function getBackupArgs
-        echo "^docker-compose\.core\.overrides\.yml\$"
+        printf "%s\n" --hidden --no-ignore "^docker-compose\.(.*\.)\?.overrides.yml|data\$" (getServiceRoot $argv)
     end
 
     runInstaller --force $argv --name "tm-forever"

scripts/Common/Software/docker/services/vaultwarden/main.fish

@@ -36,5 +36,9 @@ begin
         printf "%s\0" "$_flag_name" /
     end
 
+    function getBackupArgs
+        printf "%s\n" --hidden --no-ignore . --exclude "docker-compose.yml" (getServiceRoot $argv)
+    end
+
     runInstaller --force $argv
 end

scripts/Common/Software/docker/services/woodpecker/main.fish

@@ -108,8 +108,8 @@ begin
         printf "%s\0" "$name-ci" /
     end
 
-    function getExtraBackupPatterns
+    function getBackupArgs
-        echo "\.secret\.env\$"
+        printf "%s\n" --hidden --no-ignore "data|\.secret\.|docker-compose\.overrides\.yml" (getServiceRoot $argv)
     end
 
     runInstaller --force $argv