From b272f4d66082cb9351ec018bb96a4b7926b0c972 Mon Sep 17 00:00:00 2001 From: DeadSurfer <41702108+DeadSurfer@users.noreply.github.com> Date: Thu, 8 Apr 2021 03:25:40 +0300 Subject: [PATCH 1/3] 0.3.7 to 1.1+ dotnet image --- gta/ragemp/egg-rage--m-p.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 6ce7769b..a0ee31c1 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -7,8 +7,8 @@ "name": "Rage.MP", "author": "noreply.waypointhosting@gmail.com", "description": "https:\/\/rage.mp\/\r\n\r\nModified to work with the latest version of RAGE:MP\r\nWill automatically install linux bridge.\r\n**This server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", - "startup": ".\/server", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet", + "startup": ".\/ragemp-server", "config": { "files": "{\r\n \"conf.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"bind\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"announce\": \"{{server.build.env.ANNOUNCE}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Started HTTP server\"\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y install curl tar\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv-037.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv-037.tar.gz\r\ncurl -sSL -o bridge-linux-037.tar.gz https:\/\/cdn.rage.mp\/lin\/bridge-linux-037.tar.gz\r\n\r\ntar -xzvf ragemp-srv-037.tar.gz --strip 1 -C \/mnt\/server\r\ntar -xzvf bridge-linux-037.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv-037.tar.gz\r\nrm bridge-linux-037.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/gta\/ragemp\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", + "script": "apt update\r\napt -y install curl tar git wget\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o linux_x64.tar.gz https:\/\/cdn.rage.mp\/updater\/10_mNwuchuQ4ktWbR8d2N5jUzRt\/server-files\/linux_x64.tar.gz\r\n\r\ntar -xzvf linux_x64.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm linux_x64.tar.gz\r\n\r\nchmod +x .\/ragemp-server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/gta\/ragemp\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", "container": "debian:stable-slim", "entrypoint": "bash" } @@ -39,7 +39,7 @@ "default_value": "50", "user_viewable": 1, "user_editable": 0, - "rules": "required|integer|between:1,100" + "rules": "required|integer|between:1,10000" }, { "name": "Announce", From d195dff65d56edf5c4ff74e8098bd6de8eee93df Mon Sep 17 00:00:00 2001 From: DeadSurfer <41702108+DeadSurfer@users.noreply.github.com> Date: Sat, 10 Apr 2021 00:28:25 +0300 Subject: [PATCH 2/3] Update egg-rage--m-p.json --- gta/ragemp/egg-rage--m-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index a0ee31c1..5b3a4eab 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -11,9 +11,9 @@ "startup": ".\/ragemp-server", "config": { "files": "{\r\n \"conf.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"bind\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"announce\": \"{{server.build.env.ANNOUNCE}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Started HTTP server\"\r\n}", + "startup": "{\r\n \"done\": \"Started! Waiting for connections..\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "stop": "^X" }, "scripts": { "installation": { From d4a672e2e0225d61c54a8e030c0071add964f7fc Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 27 Apr 2021 21:46:49 -0400 Subject: [PATCH 3/3] update start detection updates "done" to `The server is ready to accept connections` --- gta/ragemp/egg-rage--m-p.json | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 5b3a4eab..31faf692 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -1,17 +1,22 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-04-22T09:18:34-04:00", + "exported_at": "2021-04-28T01:34:21+00:00", "name": "Rage.MP", "author": "noreply.waypointhosting@gmail.com", "description": "https:\/\/rage.mp\/\r\n\r\nModified to work with the latest version of RAGE:MP\r\nWill automatically install linux bridge.\r\n**This server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet" + ], + "file_denylist": [], "startup": ".\/ragemp-server", "config": { "files": "{\r\n \"conf.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"bind\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"announce\": \"{{server.build.env.ANNOUNCE}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Started! Waiting for connections..\"\r\n}", + "startup": "{\r\n \"done\": \"The server is ready to accept connections\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^X" }, @@ -28,8 +33,8 @@ "description": "Server name that will be displayed to the master server. (64 Char max)", "env_variable": "SERVER_NAME", "default_value": "RAGE:MP Unofficial server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:64" }, { @@ -37,8 +42,8 @@ "description": "Maximum number of players your server will hold. (Max 100)", "env_variable": "MAX_PLAYERS", "default_value": "50", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|integer|between:1,10000" }, { @@ -46,9 +51,9 @@ "description": "Announce to the master server so people can see you in their server browser.\r\n\r\nThis needs to be a 0 (false) or 1 (true) due to weird boolean parsing.", "env_variable": "ANNOUNCE", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|boolean" } ] -} +} \ No newline at end of file