Compare commits

..

3 commits

14 changed files with 57 additions and 21 deletions

View file

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

View file

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

View file

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

View file

@ -94,9 +94,5 @@ begin
printf "%s\0" "$_flag_name" / printf "%s\0" "$_flag_name" /
end 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 runInstaller --force $argv
end end

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,24 @@
#!/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

View file

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

View file

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

View file

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