From f14cd183782c2f1a89ea7d5397697f5b73e73bde Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 25 Aug 2024 11:36:09 +0200 Subject: [PATCH] update foundry --- foundry/egg-foundry.json | 38 ++++++++++++++-------------- foundry/egg-pterodactyl-foundry.json | 22 ++++++++-------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/foundry/egg-foundry.json b/foundry/egg-foundry.json index 7bfcc9f6..818bf8f6 100644 --- a/foundry/egg-foundry.json +++ b/foundry/egg-foundry.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-06-01T00:04:12+00:00", + "exported_at": "2024-08-25T09:33:05+00:00", "name": "Foundry", "author": "eggs@goover.dev", "uuid": "91705781-6ef4-49a7-8655-8da3b89aa99f", @@ -13,12 +13,12 @@ "steam_disk_space" ], "docker_images": { - "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + "ghcr.io\/parkervcp\/yolks:wine_latest": "ghcr.io\/parkervcp\/yolks:wine_latest" }, "file_denylist": [], "startup": "xvfb :0 -screen 0 1024x768x16; DISPLAY=:0.0 xvfb-run wine \/home\/container\/FoundryDedicatedServer.exe -log", "config": { - "files": "{\r\n \"App.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server_name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"server_password\": \"{{server.build.env.SRV_PW}}\",\r\n \"server_world_name\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"server_max_players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"server_port\": \"{{server.build.default.port}}\",\r\n \"server_query_port\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"pause_server_when_empty\": \"{{server.build.env.PAUSE_SERVER}}\",\r\n \"autosave_interval\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"server_is_public\": \"{{server.build.env.PUBLIC_SERVER}}\",\r\n \"server_persistent_data_override_folder\": \"{{server.build.env.SAVE_PATH}}\",\r\n \"map_seed\": \"{{server.build.env.MAP_SEED}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"App.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server_name\": \"{{server.environment.SERVER_NAME}}\",\r\n \"server_password\": \"{{server.environment.SRV_PW}}\",\r\n \"server_world_name\": \"{{server.environment.WORLD_NAME}}\",\r\n \"server_max_players\": \"{{server.environment.MAX_PLAYERS}}\",\r\n \"server_port\": \"{{server.allocations.default.port}}\",\r\n \"server_query_port\": \"{{server.environment.QUERY_PORT}}\",\r\n \"pause_server_when_empty\": \"{{server.environment.PAUSE_SERVER}}\",\r\n \"autosave_interval\": \"{{server.environment.AUTOSAVE_INTERVAL}}\",\r\n \"server_is_public\": \"{{server.environment.PUBLIC_SERVER}}\",\r\n \"server_persistent_data_override_folder\": \"{{server.environment.SAVE_PATH}}\",\r\n \"map_seed\": \"{{server.environment.MAP_SEED}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Dedicated server is now running!\"\r\n}", "logs": "{}", "stop": "^C" @@ -32,6 +32,7 @@ }, "variables": [ { + "sort": null, "name": "[SERVER] Steam Query Port", "description": "Sets the network port used by the Steam server browser to query information about the game. This is only used if the server is set to public.", "env_variable": "QUERY_PORT", @@ -39,10 +40,10 @@ "user_viewable": true, "user_editable": false, "rules": "required|integer|between:1024,65536", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Server Name", "description": "This is the name of the server listed in the Steam server browser.", "env_variable": "SERVER_NAME", @@ -50,10 +51,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:40", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Server World Name", "description": "Sets the server world name. This is the folder where the save files will be stored.", "env_variable": "WORLD_NAME", @@ -61,10 +62,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:20", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Server Password", "description": "Sets the server password.", "env_variable": "SRV_PW", @@ -72,10 +73,10 @@ "user_viewable": true, "user_editable": true, "rules": "nullable|string|max:20", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Pause Server When Empty", "description": "Will the server pause when nobody is connected.", "env_variable": "PAUSE_SERVER", @@ -83,10 +84,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|in:true,false", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Autosave Interval", "description": "Sets the autosave frequency in seconds.", "env_variable": "AUTOSAVE_INTERVAL", @@ -94,10 +95,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|numeric", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Server Public", "description": "Sets whether the server is listed on the Steam server browser.", "env_variable": "PUBLIC_SERVER", @@ -105,10 +106,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|in:true,false", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Map Seed", "description": "Sets the map seed used to generate the world.", "env_variable": "MAP_SEED", @@ -116,10 +117,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|numeric", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Server Max Players", "description": "This sets the max amount of players on a server.", "env_variable": "MAX_PLAYERS", @@ -127,10 +128,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|numeric", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Savepath", "description": "", "env_variable": "SAVE_PATH", @@ -138,10 +139,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|string", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[SERVER] Auto update the server", "description": "", "env_variable": "AUTO_UPDATE", @@ -149,10 +150,10 @@ "user_viewable": true, "user_editable": true, "rules": "required|boolean", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "WINDOWS_INSTALL", "description": "", "env_variable": "WINDOWS_INSTALL", @@ -160,10 +161,10 @@ "user_viewable": false, "user_editable": false, "rules": "required|in:1", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[STEAM] Steam App ID", "description": "Steam App ID", "env_variable": "SRCDS_APPID", @@ -171,10 +172,10 @@ "user_viewable": false, "user_editable": false, "rules": "required|string|in:2915550", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[WINE] WINETRICKS_RUN", "description": "", "env_variable": "WINETRICKS_RUN", @@ -182,10 +183,10 @@ "user_viewable": false, "user_editable": false, "rules": "required|string", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[WINE] WINEDEBUG", "description": "", "env_variable": "WINEDEBUG", @@ -193,10 +194,10 @@ "user_viewable": false, "user_editable": false, "rules": "required|string", - "sort": null, "field_type": "text" }, { + "sort": null, "name": "[WINE] XVFB", "description": "", "env_variable": "XVFB", @@ -204,7 +205,6 @@ "user_viewable": false, "user_editable": false, "rules": "required|in:1", - "sort": null, "field_type": "text" } ] diff --git a/foundry/egg-pterodactyl-foundry.json b/foundry/egg-pterodactyl-foundry.json index 0f42e98a..ab4a2ebf 100644 --- a/foundry/egg-pterodactyl-foundry.json +++ b/foundry/egg-pterodactyl-foundry.json @@ -1,10 +1,10 @@ { - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PANEL", + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "update_url": null, - "version": "PTDL_v2" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2024-06-01T00:04:12+00:00", + "exported_at": "2024-08-25T11:31:45+02:00", "name": "Foundry", "author": "eggs@goover.dev", "description": "Build a factory optimized to perfection or an artistic masterpiece in an infinite voxel world. Mine and harvest resources, automate your ever-growing production lines and manage complex systems while researching your way to mechanical mastery in FOUNDRY.", @@ -12,21 +12,21 @@ "steam_disk_space" ], "docker_images": { - "ghcr.io/parkervcp/yolks:wine_staging": "ghcr.io/parkervcp/yolks:wine_staging" + "ghcr.io\/parkervcp\/yolks:wine_latest": "ghcr.io\/parkervcp\/yolks:wine_latest" }, "file_denylist": [], - "startup": "xvfb :0 -screen 0 1024x768x16; DISPLAY=:0.0 xvfb-run wine /home/container/FoundryDedicatedServer.exe -log", + "startup": "xvfb :0 -screen 0 1024x768x16; DISPLAY=:0.0 xvfb-run wine \/home\/container\/FoundryDedicatedServer.exe -log", "config": { "files": "{\r\n \"App.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server_name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"server_password\": \"{{server.build.env.SRV_PW}}\",\r\n \"server_world_name\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"server_max_players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"server_port\": \"{{server.build.default.port}}\",\r\n \"server_query_port\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"pause_server_when_empty\": \"{{server.build.env.PAUSE_SERVER}}\",\r\n \"autosave_interval\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"server_is_public\": \"{{server.build.env.PUBLIC_SERVER}}\",\r\n \"server_persistent_data_override_folder\": \"{{server.build.env.SAVE_PATH}}\",\r\n \"map_seed\": \"{{server.build.env.MAP_SEED}}\"\r\n }\r\n }\r\n}", - "logs": "{}", "startup": "{\r\n \"done\": \"Dedicated server is now running!\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "container": "ghcr.io/parkervcp/installers:debian", - "entrypoint": "bash", - "script": "#!/bin/bash\r\n\r\nclear\r\nRED='\\033[0;31m'\r\nGREEN='\\033[0;32m'\r\nYELLOW='\\033[1;33m'\r\nBLUE='\\033[0;34m'\r\nNC='\\033[0m'\r\n\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}Foundry Installscript${NC}\"\r\necho -e \"${YELLOW}Egg by gOOvER | 2024 MIT Licence${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}download and install steamcmd. please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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\nmkdir -p /mnt/server/steamapps # Fix steamcmd disk write error when this folder is missing\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\necho -e \"${GREEN}..done..${NC}\"\r\n\r\n## install game using steamcmd\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}install game using steamcmd. please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\n./steamcmd.sh +force_install_dir /mnt/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] \u0026\u0026 printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update 1007 +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_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\r\n\r\n# add below your custom commands if needed\r\nmkdir -p $HOME/Mods\r\nmkdir -p $HOME/serverfiles\r\n\r\n#ccheck for config\r\nFILE=$HOME/App.cfg\r\n\r\nif [ -f \"$FILE\" ]; then\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n echo -e \"${GREEN}App.cfg found.${NC}\"\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\nelse \r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n echo -e \"${RED}No App.cfg found. downloading default...${NC}\"\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n cd $HOME\r\n curl -sSL -o App.cfg https://dedicated.foundry-game.com/App.cfg\r\n echo -e \"${GREEN}..done..${NC}\"\r\nfi\r\n\r\n## cleanup to prevent errors\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${RED}deleting old wine dirs... please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\nif [ ! -d \"/mnt/server/.wine\" ]; then\r\n rm -fR /mnt/server/.wine\r\n rm -fR /mnt/server/.config\r\n rm -fR /mnt/server/.cache\r\n rm -fR /mnt/server/.local\r\n rm -fR /mnt/server/appcache\r\nfi\r\necho -e \"${GREEN}..done..${NC}\"\r\n\r\n## install end\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${GREEN}Installation completed...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"" + "script": "#!\/bin\/bash\r\n\r\nclear\r\nRED='\\033[0;31m'\r\nGREEN='\\033[0;32m'\r\nYELLOW='\\033[1;33m'\r\nBLUE='\\033[0;34m'\r\nNC='\\033[0m'\r\n\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}Foundry Installscript${NC}\"\r\necho -e \"${YELLOW}Egg by gOOvER | 2024 MIT Licence${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}download and install steamcmd. please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\necho -e \"${GREEN}..done..${NC}\"\r\n\r\n## install game using steamcmd\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${YELLOW}install game using steamcmd. please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update 1007 +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_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\r\n\r\n# add below your custom commands if needed\r\nmkdir -p $HOME\/Mods\r\nmkdir -p $HOME\/serverfiles\r\n\r\n#ccheck for config\r\nFILE=$HOME\/App.cfg\r\n\r\nif [ -f \"$FILE\" ]; then\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n echo -e \"${GREEN}App.cfg found.${NC}\"\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\nelse \r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n echo -e \"${RED}No App.cfg found. downloading default...${NC}\"\r\n echo -e \"${BLUE}-------------------------------------------------${NC}\"\r\n cd $HOME\r\n curl -sSL -o App.cfg https:\/\/dedicated.foundry-game.com\/App.cfg\r\n echo -e \"${GREEN}..done..${NC}\"\r\nfi\r\n\r\n## cleanup to prevent errors\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${RED}deleting old wine dirs... please wait...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\n\r\nif [ ! -d \"\/mnt\/server\/.wine\" ]; then\r\n rm -fR \/mnt\/server\/.wine\r\n rm -fR \/mnt\/server\/.config\r\n rm -fR \/mnt\/server\/.cache\r\n rm -fR \/mnt\/server\/.local\r\n rm -fR \/mnt\/server\/appcache\r\nfi\r\necho -e \"${GREEN}..done..${NC}\"\r\n\r\n## install end\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"\r\necho -e \"${GREEN}Installation completed...${NC}\"\r\necho -e \"${BLUE}-------------------------------------------------${NC}\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" } }, "variables": [ @@ -124,7 +124,7 @@ "name": "[SERVER] Savepath", "description": "", "env_variable": "SAVE_PATH", - "default_value": "/home/container/serverfiles", + "default_value": "\/home\/container\/serverfiles", "user_viewable": true, "user_editable": true, "rules": "required|string",