Merge from main by hand.

docker-compose.yml

@@ -13,12 +13,15 @@ volumes:
   # For Steam, for now
   homedir_server1:
   homedir_server2:
+  homedir_server3:
   # Server mission files
   mpmissions1:
   mpmissions2:
+  mpmissions3:
   # Server profile files
   profiles1:
   profiles2:
+  profiles3:
 
 services:
 
@@ -109,3 +112,25 @@ services:
     restart: no
     env_file:
       - .env2 # <-- here
+
+  server3: # <-- here
+    build:
+      context: server
+      args:
+        - USER_ID
+    user: ${USER_ID}
+    volumes:
+      # Common volumes
+      - ./files:/files
+      - mods:/mods
+      - ./server:/server
+      - serverfiles:/serverfiles
+      - servermpmissions:/mpmissions:ro
+      # Server-specific volumes
+      - homedir_server3:/home/user # <-- here
+      - mpmissions3:/serverfiles/mpmissions # <-- here
+      - profiles3:/profiles # <-- here
+    network_mode: host
+    restart: no
+    env_file:
+      - .env3 # <-- here

files/bin/dz-common

@@ -6,6 +6,16 @@ set -eEa
 # The steam query port is set in serverDZ.cfg.
 
 # Server port. Set these in the .env file for the container.
+if [[ ${SERVER_PORT} = "" ]]
+then
+	export SERVER_PORT=2302
+fi
+
+if [[ ${RCON_PORT} = "" ]]
+then
+	export RCON_PORT=2303
+fi
+
 export port=${SERVER_PORT}
 export rcon_port=${RCON_PORT}
 

files/mods/enoch/map.env

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-MAP="Enoch"
+MAP="Default Maps"
 DIR="DayZ-Central-Economy"
 REPO="https://github.com/BohemiaInteractive/${DIR}.git"
-MPDIR="dayzOffline.enoch"
+MPDIR="dayzOffline.*"

server/bin/dz

@@ -5,7 +5,7 @@ source dz-common
 # Server container base directories
 MPMISSIONS="${SERVER_FILES}/mpmissions"
 
-mkdir -p ${SERVER_PROFILE}/battleye
+mkdir -p "${SERVER_PROFILE}"/battleye
 
 # Server configuration file
 SERVER_CFG_FILE="serverDZ.cfg"
@@ -138,15 +138,18 @@ mergexml(){
 
 	# Copy the pristine files from upstream
 	echo -e "${green}Copying upstream files into local mpmissions for map ${MAP}${default}":
-	find /mpmissions/${MAP} \( \
+	# Not all maps have all files, so we need to check for their existence before copying them
-		-name "cfgeconomycore.xml" \
+	for i in "cfgeconomycore.xml" "cfgenvironment.xml" "cfgeventgroups.xml" "cfgeventspawns.xml" "cfggameplay.json" "cfgweather.xml" "init.c"
-		-o -name "cfgenvironment.xml" \
+	do
-		-o -name "cfgeventgroups.xml" \
+		if [ -f /mpmissions/${MAP}/${i} ]
-		-o -name "cfgeventspawns.xml" \
+		then
-		-o -name "cfggameplay.json" \
+			cp -v /mpmissions/${MAP}/${i} ${MPMISSIONS}/${MAP}/${i}
-		-o -name "cfgweather.xml" \
+		else
-		-o -name "init.c" \
+			# Copy it from the Chernarus map
-	\) -exec cp -v {} ${SERVER_FILES}{} \;
+			echo "The map ${MAP} does not have a ${i} file, copying from Chernarus..."
+			cp -v /mpmissions/dayzOffline.chernarusplus/${i} ${MPMISSIONS}/${MAP}/${i}
+		fi
+	done
 
 	# Same for any files in the db subdirectory we may modify
 	find /mpmissions/${MAP}/db \( \
@@ -378,10 +381,8 @@ start(){
 			echo "Caught SIGTERM/SIGINT..."
 			exit 0
 		' SIGTERM SIGINT
-		while [ true ]
+		tail -f /dev/null &
-		do
+		wait $!
-			sleep 1
-		done
 		exit 0
 	fi
 	# Clean up from previous runs

web/bin/dz

@@ -122,6 +122,7 @@ add(){
 	symlink 1 ${1} "${MODNAME}"
 	echo -e "Mod id ${1} - ${green}${MODNAME}${default} - added"
 	xml ${ID}
+	map ${ID}
 }
 
 # Remove a mod
@@ -190,6 +191,10 @@ install(){
 		printf "[ ${yellow}DayZ${default} ] Downloading DayZ Server-Files!\n"
 		dologin
 		${STEAMCMD} +force_install_dir ${SERVER_FILES} +login "${steamlogin}" +app_update "${release_server_appid}" validate +quit
+		# This installs the mpmissions for charnarusplus and enoch (AKA Livonia) from github. The game once allowed the full server
+		# to be downloaded, but now you get the server without any mpmissions. This is a workaround.
+		echo "Installing mpmissions for ChernarusPlus and Livonia from github..."
+		map default
 	else
 		printf "[ ${lightblue}DayZ${default} ] The server is already installed.\n"
 	fi