„scripts/start-server.sh“ ändern

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: ich777

Dockerfile

@@ -1,10 +1,11 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+FROM ich777/debian-baseimage
 
 LABEL org.opencontainers.image.authors="admin@minenet.at"
 LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
-RUN apt-get update && \
-	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 && \
+RUN dpkg --add-architecture i386 && \
+	apt-get update && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 libcurl4-gnutls-dev:i386 libcurl4-gnutls-dev screen && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -13,7 +14,9 @@ ENV SERVER_DIR="${DATA_DIR}/serverfiles"
 ENV GAME_ID="template"
 ENV GAME_NAME="template"
 ENV GAME_PARAMS="template"
+ENV FORCE_X64="true"
 ENV GAME_PORT=27015
+ENV CAVES=""
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99
@@ -26,6 +29,8 @@ ENV DATA_PERM=770
 RUN mkdir $DATA_DIR && \
 	mkdir $STEAMCMD_DIR && \
 	mkdir $SERVER_DIR && \
+	mkdir $DATA_DIR/.klei && \
+	mkdir $DATA_DIR/.klei/DoNotStarveTogether && \
 	useradd -d $DATA_DIR -s /bin/bash $USER && \
 	chown -R $USER $DATA_DIR && \
 	ulimit -n 2048
@@ -34,4 +39,4 @@ ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,40 +1,41 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
+This Docker will download and install SteamCMD. It will also install Don't Starve Together and run it.
 
-**Please see the different Tags/Branches which games are available.**
+**ATTENTION:** After the first complete startup (you can see it in the log) copy your 'cluster_token.txt' in the 'token/Cluster_1' folder and restart the container.
 
-## Example Env params for CS:Source
+**Update Notice:** Simply restart the container if a newer version of the game is available.
+
+## Env params
 | Name | Value | Example |
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| GAME_ID | The GAME_ID that the container downloads at startup. If you want to install a static or beta version of the game change the value to: '232330 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 232330 |
-| GAME_NAME | SRCDS gamename | cstrike |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| GAME_ID | The GAME_ID that the container downloads at startup. If you want to install a static or beta version of the game change the value to: '343050 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 343050 |
+| CAVES | Delete 'true' if you don't want Caves on your Server. | true |
+| GAME_PARAMS | Values to start the server | empty |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | blank |
+| VALIDATE | Validates the game data | true |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-## Run example for CS:Source
+## Run example
 ```
-docker run --name CSSource -d \
-	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=232330' \
-	--env 'GAME_NAME=cstrike' \
-	--env 'GAME_PORT=27015' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+docker run --name DontStarveTogether -d \
+	-p 10890:10890/udp -p 27016:27016/udp -p 8766:8766/udp \
+	--env 'GAME_ID=343050' \
+	--env 'CAVES=true' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/dontstarve:/serverdata/serverfiles \
+	--volume /path/to/dontstarve/token:/serverdata/.klei/DoNotStarveTogether \
+	ich777/steamcmd:dontstarve
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!
 
+
 This Docker is forked from mattieserver, thank you for this wonderfull Docker.
 
-#### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/
+### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

config/adminlist.txt

@@ -0,0 +1 @@
+Put the KU_xx identitifers of the server admins here (one by line).

config/caves_server.ini

@@ -0,0 +1,11 @@
+[NETWORK]
+server_port = 10891
+
+[SHARD]
+is_master = false
+name = Caves
+id = 2
+
+[STEAM]
+master_server_port = 27017
+authentication_port = 8767

config/caves_worldgenoverride.lua

@@ -0,0 +1,7 @@
+KLEI     1 return {
+	override_enabled = true,
+	worldgen_preset = "DST_CAVE",
+	settings_preset = "DST_CAVE",
+	overrides = {
+	},
+}

config/cluster.ini

@@ -0,0 +1,24 @@
+[GAMEPLAY]
+game_mode = survival
+max_players = 6
+pvp = false
+pause_when_empty = true
+
+
+[NETWORK]
+cluster_description = Simple Unraid Docker Server
+cluster_name = Docker Server
+cluster_intention = cooperative
+cluster_password = Docker
+
+
+[MISC]
+console_enabled = true
+
+
+[SHARD]
+shard_enabled = true
+bind_ip = 127.0.0.1
+master_ip = 127.0.0.1
+master_port = 10892
+cluster_key = supersecretkey

config/cluster_token.txt

@@ -0,0 +1 @@
+Replace this file with your 'cluster_token.txt'

config/server.ini

@@ -0,0 +1,11 @@
+[NETWORK]
+server_port = 10890
+
+
+[SHARD]
+is_master = true
+
+
+[STEAM]
+master_server_port = 27016
+authentication_port = 8766

config/worldgenoverride.lua

@@ -0,0 +1,106 @@
+return {
+	override_enabled = true,
+	preset = "SURVIVAL_TOGETHER", 			-- "SURVIVAL_TOGETHER", "MOD_MISSING", "SURVIVAL_TOGETHER_CLASSIC", "SURVIVAL_DEFAULT_PLUS", "COMPLETE_DARKNESS", "DST_CAVE", "DST_CAVE_PLUS"
+	overrides = {
+		-- MISC
+		task_set = "default", 			-- "classic", "default", "cave_default"
+		start_location = "default", 	-- "caves", "default", "plus", "darkness"
+		world_size = "default", 		-- "small", "medium", "default", "huge"
+		branching = "default", 			-- "never", "least", "default", "most"
+		loop = "default", 				-- "never", "default", "always"
+		specialevent = "default",       -- "none", "default", "hallowed_nights", "winters_feast", "year_of_the_gobbler"
+		autumn = "default", 			-- "noseason", "veryshortseason", "shortseason", "default", "longseason", "verylongseason", "random"
+		winter = "default", 			-- "noseason", "veryshortseason", "shortseason", "default", "longseason", "verylongseason", "random"
+		spring = "default", 			-- "noseason", "veryshortseason", "shortseason", "default", "longseason", "verylongseason", "random"
+		summer = "default", 			-- "noseason", "veryshortseason", "shortseason", "default", "longseason", "verylongseason", "random"
+		season_start = "default", 		-- "default", "winter", "spring", "summer", "autumnorspring", "winterorsummer", "random"
+		day = "default", 				-- "default", "longday", "longdusk", "longnight", "noday", "nodusk", "nonight", "onlyday", "onlydusk", "onlynight"
+		weather = "default", 			-- "never", "rare", "default", "often", "always"
+		earthquakes = "default", 		-- "never", "rare", "default", "often", "always"
+		lightning = "default", 			-- "never", "rare", "default", "often", "always"
+		frograin = "default", 			-- "never", "rare", "default", "often", "always"
+		wildfires = "default", 			-- "never", "rare", "default", "often", "always"
+		regrowth = "default", 			-- "veryslow", "slow", "default", "fast", "veryfast"
+		touchstone = "default", 		-- "never", "rare", "default", "often", "always"
+		boons = "default", 				-- "never", "rare", "default", "often", "always"
+		cavelight = "default", 			-- "veryslow", "slow", "default", "fast", "veryfast"
+		disease_delay = "default", 		-- "none", "random", "long", "default", "short"
+		prefabswaps_start = "default", 	-- "classic", "default", "highly random"
+		petrification = "default", 		-- "none", "few", "default", "many", "max"
+
+		-- RESOURCES
+		flowers = "default", 			-- "never", "rare", "default", "often", "always"
+		grass = "default", 				-- "never", "rare", "default", "often", "always"
+		sapling = "default", 			-- "never", "rare", "default", "often", "always"
+		marshbush = "default", 			-- "never", "rare", "default", "often", "always"
+		tumbleweed = "default", 		-- "never", "rare", "default", "often", "always"
+		reeds = "default", 				-- "never", "rare", "default", "often", "always"
+		trees = "default", 				-- "never", "rare", "default", "often", "always"
+		flint = "default", 				-- "never", "rare", "default", "often", "always"
+		rock = "default", 				-- "never", "rare", "default", "often", "always"
+		rock_ice = "default", 			-- "never", "rare", "default", "often", "always"
+		meteorspawner = "default", 		-- "never", "rare", "default", "often", "always"
+		meteorshowers = "default", 		-- "never", "rare", "default", "often", "always"
+		mushtree = "default", 			-- "never", "rare", "default", "often", "always"
+		fern = "default", 				-- "never", "rare", "default", "often", "always"
+		flower_cave = "default", 		-- "never", "rare", "default", "often", "always"
+		wormlights = "default", 		-- "never", "rare", "default", "often", "always"
+
+		-- UNPREPARED
+		berrybush = "default", 			-- "never", "rare", "default", "often", "always"
+		carrot = "default", 			-- "never", "rare", "default", "often", "always"
+		mushroom = "default", 			-- "never", "rare", "default", "often", "always"
+		cactus = "default", 			-- "never", "rare", "default", "often", "always"
+		banana = "default", 			-- "never", "rare", "default", "often", "always"
+		lichen = "default", 			-- "never", "rare", "default", "often", "always"
+
+		-- ANIMALS
+		rabbits = "default", 			-- "never", "rare", "default", "often", "always"
+		moles = "default", 				-- "never", "rare", "default", "often", "always"
+		butterfly = "default", 			-- "never", "rare", "default", "often", "always"
+		birds = "default", 				-- "never", "rare", "default", "often", "always"
+		buzzard = "default", 			-- "never", "rare", "default", "often", "always"
+		catcoon = "default", 			-- "never", "rare", "default", "often", "always"
+		perd = "default", 				-- "never", "rare", "default", "often", "always"
+		pigs = "default", 				-- "never", "rare", "default", "often", "always"
+		lightninggoat = "default", 		-- "never", "rare", "default", "often", "always"
+		beefalo = "default", 			-- "never", "rare", "default", "often", "always"
+		beefaloheat = "default", 		-- "never", "rare", "default", "often", "always"
+		hunt = "default", 				-- "never", "rare", "default", "often", "always"
+		alternatehunt = "default", 		-- "never", "rare", "default", "often", "always"
+		penguins = "default", 			-- "never", "rare", "default", "often", "always"
+		cave_ponds = "default", 		-- "never", "rare", "default", "often", "always"
+		ponds = "default", 				-- "never", "rare", "default", "often", "always"
+		bees = "default", 				-- "never", "rare", "default", "often", "always"
+		angrybees = "default", 			-- "never", "rare", "default", "often", "always"
+		tallbirds = "default", 			-- "never", "rare", "default", "often", "always"
+		slurper = "default", 			-- "never", "rare", "default", "often", "always"
+		bunnymen = "default", 			-- "never", "rare", "default", "often", "always"
+		slurtles = "default", 			-- "never", "rare", "default", "often", "always"
+		rocky = "default", 				-- "never", "rare", "default", "often", "always"
+		monkey = "default", 			-- "never", "rare", "default", "often", "always"
+
+		-- MONSTERS
+		spiders = "default", 			-- "never", "rare", "default", "often", "always"
+		cave_spiders = "default", 		-- "never", "rare", "default", "often", "always"
+		hounds = "default", 			-- "never", "rare", "default", "often", "always"
+		houndmound = "default", 		-- "never", "rare", "default", "often", "always"
+		merm = "default", 				-- "never", "rare", "default", "often", "always"
+		tentacles = "default", 			-- "never", "rare", "default", "often", "always"
+		chess = "default", 				-- "never", "rare", "default", "often", "always"
+		lureplants = "default", 		-- "never", "rare", "default", "often", "always"
+		walrus = "default", 			-- "never", "rare", "default", "often", "always"
+		liefs = "default", 				-- "never", "rare", "default", "often", "always"
+		deciduousmonster = "default", 	-- "never", "rare", "default", "often", "always"
+		krampus = "default", 			-- "never", "rare", "default", "often", "always"
+		bearger = "default", 			-- "never", "rare", "default", "often", "always"
+		deerclops = "default", 			-- "never", "rare", "default", "often", "always"
+		goosemoose = "default", 		-- "never", "rare", "default", "often", "always"
+		dragonfly = "default", 			-- "never", "rare", "default", "often", "always"
+		antliontribute = "default", 	-- "never", "rare", "default", "often", "always"
+		bats = "default", 				-- "never", "rare", "default", "often", "always"
+		fissure = "default", 			-- "never", "rare", "default", "often", "always"
+		wormattacks = "default", 		-- "never", "rare", "default", "often", "always"
+		worms = "default", 				-- "never", "rare", "default", "often", "always"
+	},
+}

scripts/start-server.sh

@@ -51,18 +51,121 @@ else
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
-	if [ ! -d ${DATA_DIR}/.steam ]; then
-    	mkdir ${DATA_DIR}/.steam
+if [ "${FORCE_X64}" == "true" ]; then
+  X64_MODE="_x64"
+  X64_PATH="64"
+fi
+if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/cluster_token.txt ]; then
+    echo "---No cluster_token.txt found, downloading template, please create your own to run the server!!!...---"
+    if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1 ]; then
+        mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
     fi
-	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk32
+    cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/cluster_token.txt ; then
+    	echo "---Sucessfully downloaded 'cluster_token.ini'---"
+	else
+    	echo "---Can't download 'cluster_token.ini', putting server into sleep mode---"
+        sleep infinity
+	fi
+fi
+if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/cluster.ini ]; then
+    echo "---No cluster.ini found, downloading template...---"
+    if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1 ]; then
+        mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
+    fi
+    cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/cluster.ini ; then
+    	echo "---Sucessfully downloaded 'cluster.ini'---"
+	else
+    	echo "---Can't download 'cluster.ini', putting server into sleep mode---"
+        sleep infinity
+	fi
+fi
+if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/adminlist.txt ]; then
+    echo "---No adminlist.txt found, downloading template...---"
+    if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1 ]; then
+        mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
+    fi
+    cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/adminlist.txt ; then
+    	echo "---Sucessfully downloaded 'adminlist.txt'---"
+	else
+    	echo "---Can't download 'adminlist.txt', putting server into sleep mode---"
+        sleep infinity
+	fi
+fi
+if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master/server.ini ]; then
+    echo "---No server.ini found, downloading template...---"
+    if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master ]; then
+        mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master
+    fi
+    cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/server.ini ; then
+    	echo "---Sucessfully downloaded 'server.ini'---"
+	else
+    	echo "---Can't download 'server.ini', putting server into sleep mode---"
+        sleep infinity
+	fi
+fi
+if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master/worldgenoverride.lua ]; then
+    echo "---No worldgenoverride.lua found, downloading template...---"
+    if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master ]; then
+        mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master
+    fi
+    cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Master
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/worldgenoverride.lua ; then
+    	echo "---Sucessfully downloaded 'worldgenoverride.lua'---"
+	else
+    	echo "---Can't download 'worldgenoverride.lua', putting server into sleep mode---"
+        sleep infinity
+	fi
+fi
+if [ "${CAVES}" == "true" ]; then
+    if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves/server.ini ]; then
+        echo "---No Caves/server.ini found, downloading template...---"
+        if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves ]; then
+            mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves
+        fi
+        cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves/server.ini https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/caves_server.ini ; then
+    		echo "---Sucessfully downloaded 'caves_server.ini'---"
+		else
+    		echo "---Can't download 'caves_server.ini', putting server into sleep mode---"
+        	sleep infinity
+		fi
+    fi
+    if [ ! -f ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves/worldgenoverride.lua ]; then
+        echo "---No Caves/worldgenoverride.lua found, downloading template...---"
+        if [ ! -d ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves ]; then
+            mkdir ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves
+        fi
+        cd ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${DATA_DIR}/.klei/DoNotStarveTogether/Cluster_1/Caves/worldgenoverride.lua https://raw.githubusercontent.com/ich777/docker-steamcmd-server/dontstarve/config/caves_worldgenoverride.lua ; then
+    		echo "---Sucessfully downloaded 'caves_worldgenoverride.lua'---"
+		else
+    		echo "---Can't download 'caves_worldgenoverride.lua', putting server into sleep mode---"
+        	sleep infinity
+		fi
     fi
-    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
 fi
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
-echo "---Start Server---"
-cd ${SERVER_DIR}
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+if [ "${CAVES}" == "true" ]; then
+    echo "---Checking for old logs---"
+    find $SERVER_DIR -name "masterLog.*" -exec rm -f {} \;
+    find $SERVER_DIR -name "cavesLog.*" -exec rm -f {} \;
+    echo "---Start Server---"
+    cd ${SERVER_DIR}/bin${X64_PATH}
+    screen -S Master -L -Logfile $SERVER_DIR/masterLog.0 -d -m ${SERVER_DIR}/bin${X64_PATH}/dontstarve_dedicated_server_nullrenderer${X64_MODE} -shard Master
+    screen -S Caves -L -Logfile $SERVER_DIR/cavesLog.0 -d -m ${SERVER_DIR}/bin${X64_PATH}/dontstarve_dedicated_server_nullrenderer${X64_MODE} -shard Caves
+    sleep 2
+    screen -S watchdog -d -m /opt/scripts/start-watchdog.sh
+    tail -f ${SERVER_DIR}/masterLog.0 ${SERVER_DIR}/cavesLog.0
+else
+    find $SERVER_DIR -name "masterLog.*" -exec rm -f {} \;
+    find $SERVER_DIR -name "cavesLog.*" -exec rm -f {} \;
+    echo "---Start Server---"
+    cd ${SERVER_DIR}/bin${X64_PATH}
+    ${SERVER_DIR}/bin${X64_PATH}/dontstarve_dedicated_server_nullrenderer${X64_MODE} -shard Master
+fi

scripts/start-watchdog.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+if [ "${FORCE_X64}" == "true" ]; then
+  killpid="$(pidof dontstarve_dedicated_server_nullrenderer_x64)"
+else
+  killpid="$(pidof dontstarve_dedicated_server_nullrenderer)"
+fi
+while true
+do
+	tail --pid=${killpid%% *} --pid=${killpid##* } -f /dev/null
+	kill "$(pidof tail)"
+	exit 0
+done

scripts/start.sh

@@ -24,14 +24,13 @@ chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
 
-# Fix for CSDM not working properly
-if [ -f "${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt" ]; then
-  chmod 550 ${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt
-fi
-
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
+	if [ "${FORCE_X64}" == "true" ]; then
+		kill -SIGTERM $(pidof dontstarve_dedicated_server_nullrenderer_x64)
+	else
+		kill -SIGTERM $(pidof dontstarve_dedicated_server_nullrenderer)
+	fi
 	wait "$killpid" -f 2>/dev/null
 	exit 143;
 }
@@ -43,4 +42,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done

tailscale.sh

@@ -1,232 +0,0 @@
-#!/bin/bash
-# The script will then add the container to your Tailscale network.
-#
-# For more information see: [Link TBD]
-
-error_handler() {
-  echo
-  echo "======================="
-  exit 1
-}
-
-echo "======================="
-echo
-
-# Import variables from s6-overlay images
-if [ -x "/usr/bin/with-contenv" ]; then
-  echo "just-containers s6-overlay image found, importing variables..."
-  ENV_VARS="$(/usr/bin/with-contenv bash -c 'env')"
-
-  while IFS='=' read -r KEY VALUE; do
-    export "${KEY}"="${VALUE}"
-  done <<< "${ENV_VARS}"
-fi
-
-if [[ ! -f /usr/bin/tailscale || ! -f /usr/bin/tailscaled ]]; then
-  if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
-    if [ ! -c /dev/net/tun ]; then
-      echo "ERROR: Device /dev/net/tun not found!"
-      echo "       Make sure to pass through /dev/net/tun to the container."
-      error_handler
-    fi
-    APT_IPTABLES="iptables "
-  fi
-
-  echo "Detecting Package Manager..."
-  if which apt-get >/dev/null 2>&1; then
-    echo "Detected Advanced Package Tool!"
-    PACKAGES_UPDATE="apt-get update"
-    PACKAGES_INSTALL="apt-get -y install --no-install-recommends"
-  elif which apk >/dev/null 2>&1; then
-    echo "Detected Alpine Package Keeper!"
-    PACKAGES_UPDATE="apk update"
-    PACKAGES_INSTALL="apk add"
-  else
-    echo "ERROR: Detection failed!"
-    error_handler
-  fi
-
-  echo "Installing dependencies..."
-  echo "Please wait..."
-  ${PACKAGES_UPDATE} >/dev/null 2>&1
-  ${PACKAGES_INSTALL} jq wget ca-certificates ${APT_IPTABLES}>/dev/null 2>&1
-  echo "Done"
-
-  if [ "${APT_IPTABLES}" == "iptables " ]; then
-    if ! iptables -L >/dev/null 2>&1; then
-      echo "ERROR: Cap: NET_ADMIN not available!"
-      echo "       Make sure to add --cap-add=NET_ADMIN to the Extra Parameters"
-      error_handler
-    fi
-  fi
-
-  echo "Tailscale not found, downloading..."
-  echo "Please wait..."
-
-  TAILSCALE_JSON=$(wget -qO- 'https://pkgs.tailscale.com/stable/?mode=json')
-
-  if [ -z "${TAILSCALE_JSON}" ]; then
-    echo "ERROR: Can't get Tailscale JSON"
-    error_handler
-  fi
-
-  TAILSCALE_TARBALL=$(echo "${TAILSCALE_JSON}" | jq -r .Tarballs.amd64)
-  TAILSCALE_VERSION=$(echo "${TAILSCALE_JSON}" | jq -r .TarballsVersion)
-
-  if [ ! -d /tmp/tailscale ]; then
-    mkdir -p /tmp/tailscale
-  fi
-
-  if wget -q -nc --show-progress --progress=bar:force:noscroll -O /tmp/tailscale/tailscale.tgz "https://pkgs.tailscale.com/stable/${TAILSCALE_TARBALL}" ; then
-    echo "Download from Tailscale version ${TAILSCALE_VERSION} successful!"
-  else
-    echo "ERROR: Download from Tailscale version ${TAILSCALE_VERSION} failed!"
-    rm -rf /tmp/tailscale
-    error_handler
-  fi
-
-  cd /tmp/tailscale
-  tar -xf /tmp/tailscale/tailscale.tgz
-  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscale /usr/bin/tailscale
-  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscaled /usr/bin/tailscaled
-  rm -rf /tmp/tailscale
-
-  echo "Done"
-
-else
-  echo "Tailscale found, continuing..."
-fi
-
-unset TSD_PARAMS
-unset TS_PARAMS
-
-if [ ! -z "${TAILSCALE_STATE_DIR}" ]; then
-  TSD_STATE_DIR="${TAILSCALE_STATE_DIR}"
-elif [ -v SERVER_DIR ]; then
-  TSD_STATE_DIR=${SERVER_DIR}/.tailscale_state
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-elif [ -v DATA_DIR ]; then
-  TSD_STATE_DIR=${DATA_DIR}/.tailscale_state
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-else
-  if [ -z "${TAILSCALE_STATE_DIR}" ]; then
-    TAILSCALE_STATE_DIR="/config/.tailscale_state"
-  fi
-  TSD_STATE_DIR=${TAILSCALE_STATE_DIR}
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-fi
-
-if [ ! -d ${TS_STATE_DIR} ]; then
-  mkdir -p ${TS_STATE_DIR}
-fi
-
-if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
-  echo "Using ${TAILSCALE_EXIT_NODE_IP} as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
-  TS_PARAMS=" --exit-node=${TAILSCALE_EXIT_NODE_IP}"
-  if [ ! -z "${TAILSCALE_ALLOW_LAN_ACCESS}" ]; then
-    echo "Enabling local LAN Access to the container!"
-    TS_PARAMS+=" --exit-node-allow-lan-access"
-  fi
-else
-  if [ -z "${TAILSCALE_USERSPACE_NETWORKING}" ] || [ "${TAILSCALE_USERSPACE_NETWORKING}" == "true" ]; then
-    TSD_PARAMS+="-tun=userspace-networking "
-  else
-    if [ ! -c /dev/net/tun ]; then
-      echo "ERROR: Device /dev/net/tun not found!"
-      echo "       Make sure to pass through /dev/net/tun to the container and add the"
-      echo "       parameter --cap-add=NET_ADMIN to the Extra Parameters!"
-      error_handler
-    fi
-  fi
-fi
-
-if [ "${TAILSCALE_USE_SSH}" == "true" ]; then
-  echo "Enabling SSH. See https://tailscale.com/kb/1193/tailscale-ssh"
-  TS_PARAMS+=" --ssh"
-fi
-
-if [ "${TAILSCALE_LOG}" != "false" ]; then
-  TSD_PARAMS+=">>/var/log/tailscaled 2>&1 "
-  TSD_MSG=" with log file /var/log/tailscaled"
-else
-  TSD_PARAMS+=">/dev/null 2>&1 "
-fi
-
-if [[ ! -z "${TAILSCALE_AUTHKEY}" && -f ${TSD_STATE_DIR}/.initialized ]]; then
-  echo
-  echo "-> It is now save to remove the variable TAILSCALE_AUTHKEY from your template <-"
-  echo
-  unset TAILSCALE_AUTHKEY
-fi
-
-if [ ! -z "${TAILSCALE_AUTHKEY}" ]; then
-  TS_AUTH="--authkey=${TAILSCALE_AUTHKEY} "
-fi
-
-if [ ! -z "${TAILSCALE_HOSTNAME}" ]; then
-  echo "Setting host name to ${TAILSCALE_HOSTNAME}"
-  TS_PARAMS+=" --hostname=${TAILSCALE_HOSTNAME/ /}"
-fi
-
-if [ "${TAILSCALE_EXIT_NODE}" == "true" ]; then
-  echo "Configuring container as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
-  TS_PARAMS+=" --advertise-exit-node"
-fi
-
-if [ ! -z "${TAILSCALED_PARAMS}" ]; then
-  TSD_PARAMS="${TAILSCALED_PARAMS} ${TSD_PARAMS}"
-fi
-
-if [ ! -z "${TAILSCALE_PARAMS}" ]; then
-  TS_PARAMS="${TAILSCALE_PARAMS}${TS_PARAMS}"
-fi
-
-echo "Starting tailscaled${TSD_MSG}"
-eval tailscaled -statedir=${TSD_STATE_DIR} ${TSD_PARAMS}&
-
-echo "Starting tailscale"
-eval tailscale up ${TS_AUTH}${TS_PARAMS}
-EXIT_STATUS="$?"
-
-if [ "${EXIT_STATUS}" == "0" ]; then
-  echo "Connecting to Tailscale successful!"
-  if [ ! -f ${TSD_STATE_DIR}/.initialized ]; then
-    echo "Please don't remove this file!" > ${TSD_STATE_DIR}/.initialized
-  fi
-else
-  echo "ERROR: Connecting to Tailscale not successful!"
-  if [ -f /var/log/tailscaled ]; then
-    echo "Please check the logs:"
-    tail -20 /var/log/tailscaled
-    echo "======================="
-  fi
-  error_handler
-fi
-
-if [[ ! -z "${TAILSCALE_SERVE_PORT}" && "$(tailscale status --json | jq -r '.CurrentTailnet.MagicDNSEnabled')" == "false" ]] ; then
-  echo "ERROR: Enable HTTPS on your Tailscale account to use Tailscale Serve/Funnel."
-  echo "See: https://tailscale.com/kb/1153/enabling-https"
-  error_handler
-fi
-
-if [ ! -z ${TAILSCALE_SERVE_PORT} ]; then
-  if [ ! -z "${TAILSCALE_SERVE_PATH}" ]; then
-    TAILSCALE_SERVE_PATH="=${TAILSCALE_SERVE_PATH}"
-  fi
-  if [ -z "${TAILSCALE_SERVE_MODE}" ]; then
-    TAILSCALE_SERVE_MODE="https"
-  fi
-  if [ -z "${TAILSCALE_SERVE_PROTOCOL_PORT}" ]; then
-    TAILSCALE_SERVE_PROTOCOL_PORT="=443"
-  fi
-  if [ "${TAILSCALE_FUNNEL}" == "true" ]; then
-    echo "Enabling Funnel! See https://tailscale.com/kb/1223/funnel"
-    eval tailscale funnel --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
-  else
-    echo "Enabling Serve! See https://tailscale.com/kb/1312/serve"
-    eval tailscale serve --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
-  fi
-fi
-
-echo
-echo "======================="