From cd5ddb66048bcefa5696391ed2867dcfe2f19f8d Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 11 Jul 2020 19:19:49 +0900 Subject: [PATCH 1/5] Update egg-conan-exiles.json --- steamcmd_servers/conan_exiles/egg-conan-exiles.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json index 09168b33..6fdc98a7 100644 --- a/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-12-25T20:34:11-05:00", + "exported_at": "2020-07-11T06:15:20-04:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", - "image": "quay.io\/parkervcp\/pterodactyl-images:wine-source", - "startup": "wine ConanSandboxServer.exe -log", + "image": "quay.io\/terrahost\/pterodactyl-images:debian_wine-5", + "startup": ".\/start_conan.sh", "config": { "files": "{}", "startup": "{}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates xvfb screen\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} validate +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates xvfb screen\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} validate +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/home\/container\/ConanSandboxServer.exe -console -log\" > \/mnt\/server\/start_conan.sh\r\nchmod +x \/mnt\/server\/start_conan.sh", + "container": "ubuntu:20.04", "entrypoint": "bash" } }, From e9016647cfff3f8da5be837b9ac9f9ab4e680557 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 11 Jul 2020 20:39:29 +0900 Subject: [PATCH 2/5] update conan --- steamcmd_servers/conan_exiles/egg-conan-exiles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json index 6fdc98a7..fadb31c8 100644 --- a/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-11T06:15:20-04:00", + "exported_at": "2020-07-11T07:38:20-04:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", - "image": "quay.io\/terrahost\/pterodactyl-images:debian_wine-5", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", "startup": ".\/start_conan.sh", "config": { "files": "{}", From 6374a53ee0c612f0deab854ae72845ccfb387cb6 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 11 Jul 2020 20:54:38 +0900 Subject: [PATCH 3/5] Update egg-conan-exiles.json --- steamcmd_servers/conan_exiles/egg-conan-exiles.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json index fadb31c8..cde80b0e 100644 --- a/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-11T07:38:20-04:00", + "exported_at": "2020-07-11T07:54:09-04:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", - "startup": ".\/start_conan.sh", + "startup": "wine \/home\/container\/ConanSandboxServer.exe -console -log", "config": { "files": "{}", "startup": "{}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates xvfb screen\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} validate +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/home\/container\/ConanSandboxServer.exe -console -log\" > \/mnt\/server\/start_conan.sh\r\nchmod +x \/mnt\/server\/start_conan.sh", - "container": "ubuntu:20.04", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -26,7 +26,7 @@ { "name": "Game ID", "description": "The ID corresponding to the game to download.", - "env_variable": "APPID", + "env_variable": "SRCDS_APPID", "default_value": "443030", "user_viewable": 1, "user_editable": 0, From 488e1639c06ce8a5b95b918358fe563c201c06f2 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 11 Jul 2020 21:34:46 +0900 Subject: [PATCH 4/5] Update egg-conan-exiles.json --- .../conan_exiles/egg-conan-exiles.json | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json index cde80b0e..9f22e274 100644 --- a/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-11T07:54:09-04:00", + "exported_at": "2020-07-11T08:34:24-04:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", - "startup": "wine \/home\/container\/ConanSandboxServer.exe -console -log", + "startup": "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine \/home\/container\/ConanSandboxServer.exe -console -log", "config": { "files": "{}", "startup": "{}", @@ -31,6 +31,42 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric|digits_between:1,6" + }, + { + "name": "XVFB Enable", + "description": "1 or 0", + "env_variable": "XVFB", + "default_value": "1", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|numeric|min:0|max:1" + }, + { + "name": "XVFB Display Width", + "description": "", + "env_variable": "DISPLAY_WIDTH", + "default_value": "640", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|numeric" + }, + { + "name": "XVFB Display Height", + "description": "", + "env_variable": "DISPLAY_HEIGHT", + "default_value": "480", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|numeric" + }, + { + "name": "XVFB Bit Deph", + "description": "", + "env_variable": "DISPLAY_DEPTH", + "default_value": "32", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|numeric" } ] } \ No newline at end of file From 51f66f862850c87cb0ab33f451c4a9313ce53faa Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 11 Jul 2020 21:37:01 +0900 Subject: [PATCH 5/5] Update egg-conan-exiles.json --- steamcmd_servers/conan_exiles/egg-conan-exiles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json index 9f22e274..65c9c0b0 100644 --- a/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -60,7 +60,7 @@ "rules": "required|numeric" }, { - "name": "XVFB Bit Deph", + "name": "XVFB Bit Depth", "description": "", "env_variable": "DISPLAY_DEPTH", "default_value": "32",