Merge pull request #17 from jsknnr/dev

fix for special characters in password and server name across the board

README.md

@@ -39,9 +39,9 @@ docker run \
   --mount type=volume,source=enshrouded-persistent-data,target=/home/steam/enshrouded/savegame \
   --publish 15636:15636/udp \
   --publish 15637:15637/udp \
-  --env=SERVER_NAME="Enshrouded Containerized Server" \
+  --env=SERVER_NAME='Enshrouded Containerized Server' \
   --env=SERVER_SLOTS=16 \
-  --env=SERVER_PASSWORD="ChangeThisPlease" \
+  --env=SERVER_PASSWORD='ChangeThisPlease' \
   --env=GAME_PORT=15636 \
   --env=QUERY_PORT=15637 \
   sknnr/enshrouded-dedicated-server:latest
@@ -73,9 +73,9 @@ podman run \
   --mount type=volume,source=enshrouded-persistent-data,target=/home/steam/enshrouded/savegame \
   --publish 15636:15636/udp \
   --publish 15637:15637/udp \
-  --env=SERVER_NAME="Enshrouded Containerized Server" \
+  --env=SERVER_NAME='Enshrouded Containerized Server' \
   --env=SERVER_SLOTS=16 \
-  --env=SERVER_PASSWORD="ChangeThisPlease" \
+  --env=SERVER_PASSWORD='ChangeThisPlease' \
   --env=GAME_PORT=15636 \
   --env=QUERY_PORT=15637 \
   docker.io/sknnr/enshrouded-dedicated-server:latest

container/default.env

@@ -1,5 +1,5 @@
-SERVER_NAME="Enshrouded Containerized"
-SERVER_PASSWORD="PleaseChangeMe"
-GAME_PORT="15636"
-QUERY_PORT="15637"
-SERVER_SLOTS="16"
+SERVER_NAME='Enshrouded Containerized'
+SERVER_PASSWORD='PleaseChangeMe'
+GAME_PORT='15636'
+QUERY_PORT='15637'
+SERVER_SLOTS='16'

container/entrypoint.sh

@@ -2,7 +2,7 @@
 
 # Validate arguments
 if [ -z "$SERVER_NAME" ]; then
-    SERVER_NAME="Enshrouded Containerized"
+    SERVER_NAME='Enshrouded Containerized'
     echo "WARN: SERVER_NAME not set, using default: Enshrouded Containerized"
 fi
 
@@ -12,17 +12,17 @@ if [ -z "$SERVER_PASSWORD" ]; then
 fi
 
 if [ -z "$GAME_PORT" ]; then
-    GAME_PORT="15636"
+    GAME_PORT='15636'
     echo "WARN: GAME_PORT not set, using default: 15636"
 fi
 
 if [ -z "$QUERY_PORT" ]; then
-    QUERY_PORT="15637"
+    QUERY_PORT='15637'
     echo "WARN: QUERY_PORT not set, using default: 15637"
 fi
 
 if [ -z "$SERVER_SLOTS" ]; then
-    SERVER_SLOTS="16"
+    SERVER_SLOTS='16'
     echo "WARN: SERVER_SLOTS not set, using default: 16"
 fi
 
@@ -37,6 +37,7 @@ if ! [ -f "${ENSHROUDED_PATH}/enshrouded_server.json" ]; then
 fi
 
 # Modify server config to match our arguments
+echo "INFO: Updating Enshrouded Server configuration"
 tmpfile=$(mktemp)
 jq --arg n "$SERVER_NAME" '.name = $n' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
 jq --arg p "$SERVER_PASSWORD" '.password = $p' ${ENSHROUDED_CONFIG} > "$tmpfile" && mv "$tmpfile" $ENSHROUDED_CONFIG
@@ -48,4 +49,5 @@ jq --arg s "$SERVER_SLOTS" '.slotCount = $s' ${ENSHROUDED_CONFIG} > "$tmpfile" &
 export WINEDEBUG=-all
 
 # Launch Enshrouded
+echo "INFO: Starting Enshrouded Dedicated Server"
 wine ${ENSHROUDED_PATH}/enshrouded_server.exe

helm/templates/deployment.yaml

@@ -27,15 +27,15 @@ spec:
 {{ toYaml .Values.resources | indent 10 }}
         env:
         - name: SERVER_NAME
-          value: {{ .Values.env.serverName | quote }}
+          value: {{ .Values.env.serverName | squote }}
         - name: SERVER_PASSWORD
-          value: {{ .Values.env.serverPassword | quote }}
+          value: {{ .Values.env.serverPassword | squote }}
         - name: GAME_PORT
-          value: {{ .Values.env.gamePort | quote }}
+          value: {{ .Values.env.gamePort | squote }}
         - name: QUERY_PORT
-          value: {{ .Values.env.queryPort | quote }}
+          value: {{ .Values.env.queryPort | squote }}
         - name: SERVER_SLOTS
-          value: {{ .Values.env.serverSlots | quote }}
+          value: {{ .Values.env.serverSlots | squote }}
         ports:
         - name: game-port
           containerPort: {{ .Values.env.gamePort | int }}

helm/values.yaml

@@ -11,8 +11,8 @@ volumes:
     size: 50Gi
   storageClassName: ""
 env:
-  serverName: "Enshrouded Server"
-  serverPassword: "picksomethingawesome"
+  serverName: 'Enshrouded Server'
+  serverPassword: 'picksomethingawesome'
   gamePort: 15636
   queryPort: 15637
   serverSlots: 16