Skip to content

Commit 655d248

Browse files
DaneEverittDaneEveritt
committed
Fix error causing inability to save variables.
1 parent d6d43eb commit 655d248

File tree

12 files changed

+73
-29
lines changed

12 files changed

+73
-29
lines changed

‎app/Http/Requests/Admin/Egg/EggVariableFormRequest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public function rules()
1818
'name' => 'required|string|min:1|max:255',
1919
'description' => 'sometimes|nullable|string',
2020
'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
21-
'default_value' => 'nullable|string',
2221
'options' => 'sometimes|required|array',
2322
'rules' => 'bail|required|string',
2423
];

‎database/seeds/eggs/minecraft/egg-spigot.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:15:08-05:00",
6+
"exported_at": "2018-01-21T16:47:24-06:00",
77
"name": "Spigot",
88
"author": "support@pterodactyl.io",
99
"description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.",
@@ -48,7 +48,7 @@
4848
"default_value": "",
4949
"user_viewable": 0,
5050
"user_editable": 0,
51-
"rules": "string"
51+
"rules": "nullable|string"
5252
}
5353
]
5454
}

‎database/seeds/eggs/rust/egg-rust.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-05T20:51:45-05:00",
6+
"exported_at": "2018-01-21T16:58:36-06:00",
77
"name": "Rust",
88
"author": "support@pterodactyl.io",
99
"description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.",
@@ -66,7 +66,7 @@
6666
"default_value": "http:\/\/pterodactyl.io",
6767
"user_viewable": 1,
6868
"user_editable": 1,
69-
"rules": "present|url"
69+
"rules": "nullable|url"
7070
},
7171
{
7272
"name": "World Size",
@@ -84,7 +84,7 @@
8484
"default_value": "",
8585
"user_viewable": 1,
8686
"user_editable": 1,
87-
"rules": "present"
87+
"rules": "nullable|string"
8888
},
8989
{
9090
"name": "Max Players",
@@ -102,7 +102,7 @@
102102
"default_value": "",
103103
"user_viewable": 1,
104104
"user_editable": 1,
105-
"rules": "present|url"
105+
"rules": "nullable|url"
106106
},
107107
{
108108
"name": "RCON Port",
@@ -129,7 +129,7 @@
129129
"default_value": "",
130130
"user_viewable": 1,
131131
"user_editable": 1,
132-
"rules": "present"
132+
"rules": "nullable|string"
133133
}
134134
]
135-
}
135+
}

‎database/seeds/eggs/source-engine/egg-ark--survival-evolved.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:29:34-05:00",
6+
"exported_at": "2018-01-21T16:59:40-06:00",
77
"name": "Ark: Survival Evolved",
88
"author": "support@pterodactyl.io",
99
"description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK",
1010
"image": "quay.io\/pterodactyl\/core:source",
1111
"startup": ".\/ShooterGame\/Binaries\/Linux\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}",
1212
"config": {
1313
"files": "{}",
14-
"startup": "{\"done\": \"gameserver Steam ID\", \"userInteraction\": []}",
15-
"logs": "{\"custom\": true, \"location\": \"logs\/latest.log\"}",
14+
"startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}",
15+
"logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}",
1616
"stop": "quit"
1717
},
1818
"scripts": {
@@ -30,7 +30,7 @@
3030
"default_value": "",
3131
"user_viewable": 1,
3232
"user_editable": 1,
33-
"rules": "alpha_dash|between:1,100"
33+
"rules": "nullable|alpha_dash|between:1,100"
3434
},
3535
{
3636
"name": "Admin Password",
@@ -39,7 +39,7 @@
3939
"default_value": "",
4040
"user_viewable": 1,
4141
"user_editable": 1,
42-
"rules": "alpha_dash|between:1,100"
42+
"rules": "nullable|alpha_dash|between:1,100"
4343
},
4444
{
4545
"name": "Maximum Players",

‎database/seeds/eggs/source-engine/egg-counter--strike--global-offensive.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:29:36-05:00",
6+
"exported_at": "2018-01-21T16:59:47-06:00",
77
"name": "Counter-Strike: Global Offensive",
88
"author": "support@pterodactyl.io",
99
"description": "Counter-Strike: Global Offensive is a multiplayer first-person shooter video game developed by Hidden Path Entertainment and Valve Corporation.",
1010
"image": "quay.io\/pterodactyl\/core:source",
1111
"startup": ".\/srcds_run -game csgo -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}",
1212
"config": {
1313
"files": "{}",
14-
"startup": "{\"done\": \"gameserver Steam ID\", \"userInteraction\": []}",
15-
"logs": "{\"custom\": true, \"location\": \"logs\/latest.log\"}",
14+
"startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}",
15+
"logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}",
1616
"stop": "quit"
1717
},
1818
"scripts": {

‎database/seeds/eggs/source-engine/egg-custom-source-engine-game.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:30:06-05:00",
6+
"exported_at": "2018-01-21T16:59:45-06:00",
77
"name": "Custom Source Engine Game",
88
"author": "support@pterodactyl.io",
99
"description": "This option allows modifying the startup arguments and other details to run a custom SRCDS based game on the panel.",

‎database/seeds/eggs/source-engine/egg-garrys-mod.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:29:37-05:00",
6+
"exported_at": "2018-01-21T16:59:47-06:00",
77
"name": "Garrys Mod",
88
"author": "support@pterodactyl.io",
99
"description": "Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.",
1010
"image": "quay.io\/pterodactyl\/core:source",
1111
"startup": ".\/srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}",
1212
"config": {
1313
"files": "{}",
14-
"startup": "{\"done\": \"gameserver Steam ID\", \"userInteraction\": []}",
15-
"logs": "{\"custom\": true, \"location\": \"logs\/latest.log\"}",
14+
"startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}",
15+
"logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}",
1616
"stop": "quit"
1717
},
1818
"scripts": {
1919
"installation": {
20-
"script": "#!\/bin\/bash\n# Garry's Mod Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 lib32stdc++6 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 4020 +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
20+
"script": "#!\/bin\/bash\n# Garry's Mod Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 4020 +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
2121
"container": "ubuntu:16.04",
2222
"entrypoint": "bash"
2323
}
@@ -42,4 +42,4 @@
4242
"rules": "required|string|alpha_num|size:32"
4343
}
4444
]
45-
}
45+
}

‎database/seeds/eggs/source-engine/egg-insurgency.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:29:33-05:00",
6+
"exported_at": "2018-01-21T16:59:48-06:00",
77
"name": "Insurgency",
88
"author": "support@pterodactyl.io",
99
"description": "Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience.",

‎database/seeds/eggs/source-engine/egg-team-fortress2.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"meta": {
44
"version": "PTDL_v1"
55
},
6-
"exported_at": "2017-11-03T22:29:33-05:00",
6+
"exported_at": "2018-01-21T16:59:45-06:00",
77
"name": "Team Fortress 2",
88
"author": "support@pterodactyl.io",
99
"description": "Team Fortress 2 is a team-based first-person shooter multiplayer video game developed and published by Valve Corporation. It is the sequel to the 1996 mod Team Fortress for Quake and its 1999 remake.",
1010
"image": "quay.io\/pterodactyl\/core:source",
1111
"startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
1212
"config": {
1313
"files": "{}",
14-
"startup": "{\"done\": \"gameserver Steam ID\", \"userInteraction\": []}",
15-
"logs": "{\"custom\": true, \"location\": \"logs\/latest.log\"}",
14+
"startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}",
15+
"logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}",
1616
"stop": "quit"
1717
},
1818
"scripts": {

‎database/seeds/eggs/terraria/egg-terraria-server--t-shock.json‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
3+
"meta": {
4+
"version": "PTDL_v1"
5+
},
6+
"exported_at": "2018-01-21T17:01:31-06:00",
7+
"name": "Terraria Server (TShock)",
8+
"author": "support@pterodactyl.io",
9+
"description": "TShock is a server modification for Terraria, written in C#, and based upon the Terraria Server API. It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.",
10+
"image": "quay.io\/pterodactyl\/core:mono",
11+
"startup": null,
12+
"config": {
13+
"files": "{\"tshock\/config.json\":{\"parser\": \"json\", \"find\":{\"ServerPort\": \"{{server.build.default.port}}\", \"MaxSlots\": \"{{server.build.env.MAX_SLOTS}}\"}}}",
14+
"startup": "{\"done\": \"Type 'help' for a list of commands\", \"userInteraction\": []}",
15+
"logs": "{\"custom\": false, \"location\": \"ServerLog.txt\"}",
16+
"stop": "exit"
17+
},
18+
"scripts": {
19+
"installation": {
20+
"script": "#!\/bin\/ash\n# TShock Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add curl unzip\n\ncd \/tmp\n\ncurl -sSLO https:\/\/github.com\/NyxStudios\/TShock\/releases\/download\/v${T_VERSION}\/tshock_${T_VERSION}.zip\n\nunzip -o tshock_${T_VERSION}.zip -d \/mnt\/server",
21+
"container": "alpine:3.4",
22+
"entrypoint": "ash"
23+
}
24+
},
25+
"variables": [
26+
{
27+
"name": "TShock Version",
28+
"description": "Which version of TShock to install and use.",
29+
"env_variable": "T_VERSION",
30+
"default_value": "4.3.22",
31+
"user_viewable": 1,
32+
"user_editable": 1,
33+
"rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/"
34+
},
35+
{
36+
"name": "Maximum Slots",
37+
"description": "Total number of slots to allow on the server.",
38+
"env_variable": "MAX_SLOTS",
39+
"default_value": "20",
40+
"user_viewable": 1,
41+
"user_editable": 0,
42+
"rules": "required|numeric|digits_between:1,3"
43+
}
44+
]
45+
}

0 commit comments

Comments
 (0)