From b30dc96654600a415e4145bf692a5b1f2e5dab15 Mon Sep 17 00:00:00 2001 From: Exonical Date: Tue, 13 Feb 2018 23:23:58 -0500 Subject: [PATCH 1/4] Add more server variables --- GTA/FiveM/egg-five-m.json | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/GTA/FiveM/egg-five-m.json b/GTA/FiveM/egg-five-m.json index c43c5d6f..dec1dfd8 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -3,34 +3,52 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-13T11:13:28-05:00", - "name": "FiveM", + "exported_at": "2018-02-13T23:23:06-05:00", + "name": "FXServer Vanilla", "author": "parker@parkervcp.com", "description": "The FiveM multiplayer server on Pterodactyl.", "image": "quay.io\/pterodactyl\/core:glibc", "startup": ".\/cfx-server\/FXServer +exec server.cfg +set sv_licenseKey {{FIVEM_LICENSE}} +set citizen_dir \/home\/container\/cfx-server\/citizen", "config": { - "files": "{\r\n \"server_data\/server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"sv_licenseKey\": \"sv_licenseKey {{FIVEM_LICENSE}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.HOSTNAME}}\\\"\",\r\n \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_CLIENTS}}\",\r\n \"sv_licenseKey\": \"sv_licenseKey {{server.build.env.FIVEM_LICENSE}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server license key authentication succeeded. Welcome!\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/446-8a058b67e5f11677c380a330f677e768e2b2a705\/fx.tar.xz\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/446-8a058b67e5f11677c380a330f677e768e2b2a705\/fx.tar.xz\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\ncurl https:\/\/hastebin.com\/raw\/lawubemuhe >> server.cfg", "container": "alpine:3.7", "entrypoint": "ash" } }, "variables": [ { - "name": "fivem license", - "description": "Required to start the service. Get your keys at https:\/\/keymaster.fivem.net\/", + "name": "Server License Key", + "description": "Key is required to start the service.", "env_variable": "FIVEM_LICENSE", - "default_value": "", + "default_value": "null", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:32" + }, + { + "name": "Hostname", + "description": "The name of your server as it appears in the server list.", + "env_variable": "HOSTNAME", + "default_value": "My FX Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + }, + { + "name": "Max Players", + "description": "Maximum amount of players at one time.", + "env_variable": "MAX_CLIENTS", + "default_value": "31", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|numeric|max:31" } ] } From 36319349aa23544a33109832f49d3fe3ccb9e30e Mon Sep 17 00:00:00 2001 From: Exonical Date: Tue, 13 Feb 2018 23:25:28 -0500 Subject: [PATCH 2/4] Change Variable Default --- GTA/FiveM/egg-five-m.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GTA/FiveM/egg-five-m.json b/GTA/FiveM/egg-five-m.json index dec1dfd8..ba94efd2 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -27,7 +27,7 @@ "name": "Server License Key", "description": "Key is required to start the service.", "env_variable": "FIVEM_LICENSE", - "default_value": "null", + "default_value": "", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:32" From ed0b20599c40d7b75854dab746776db22ec51822 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 15 Feb 2018 23:31:37 -0500 Subject: [PATCH 3/4] Fix Name --- GTA/FiveM/egg-five-m.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GTA/FiveM/egg-five-m.json b/GTA/FiveM/egg-five-m.json index ba94efd2..6b297507 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -4,7 +4,7 @@ "version": "PTDL_v1" }, "exported_at": "2018-02-13T23:23:06-05:00", - "name": "FXServer Vanilla", + "name": "FiveM", "author": "parker@parkervcp.com", "description": "The FiveM multiplayer server on Pterodactyl.", "image": "quay.io\/pterodactyl\/core:glibc", From f92da6f0181769a6b27cefc1b532d3068c69ee10 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 15 Feb 2018 23:32:53 -0500 Subject: [PATCH 4/4] Add Server Key Link --- GTA/FiveM/egg-five-m.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GTA/FiveM/egg-five-m.json b/GTA/FiveM/egg-five-m.json index 6b297507..4c58690c 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -25,7 +25,7 @@ "variables": [ { "name": "Server License Key", - "description": "Key is required to start the service.", + "description": "Key is required to start the service. Get your keys at https://keymaster.fivem.net", "env_variable": "FIVEM_LICENSE", "default_value": "", "user_viewable": 1,