From bd5472e2e6caf305be3169c8602526c91c7977b4 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 16 May 2021 21:27:55 +0300 Subject: [PATCH 1/2] Update voice server eggs (#3333) * Remove numeric input rule from mumble * Delete unnecessary file removal line --- .../eggs/voice-servers/egg-mumble-server.json | 13 +++++++++---- .../eggs/voice-servers/egg-teamspeak3-server.json | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/database/Seeders/eggs/voice-servers/egg-mumble-server.json b/database/Seeders/eggs/voice-servers/egg-mumble-server.json index 4f3acf7df..d08eeb32c 100644 --- a/database/Seeders/eggs/voice-servers/egg-mumble-server.json +++ b/database/Seeders/eggs/voice-servers/egg-mumble-server.json @@ -1,13 +1,18 @@ { "_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-10-25T22:34:06+00:00", + "exported_at": "2021-05-06T23:35:46+03:00", "name": "Mumble Server", "author": "support@pterodactyl.io", "description": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.", - "image": "quay.io\/pterodactyl\/core:glibc", + "features": null, + "images": [ + "quay.io\/pterodactyl\/core:glibc" + ], + "file_denylist": [], "startup": ".\/murmur.x86 -fg", "config": { "files": "{\"murmur.ini\":{\"parser\": \"ini\", \"find\":{\"logfile\": \"murmur.log\", \"port\": \"{{server.build.default.port}}\", \"host\": \"0.0.0.0\", \"users\": \"{{server.build.env.MAX_USERS}}\"}}}", @@ -39,7 +44,7 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|regex:\/^([0-9_\\.-]{5,8})$\/" + "rules": "required|string" } ] } \ No newline at end of file diff --git a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json index 812d672a6..f22fcef1f 100644 --- a/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-01-12T15:44:41+01:00", + "exported_at": "2021-05-06T23:38:28+03:00", "name": "Teamspeak3 Server", "author": "support@pterodactyl.io", "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", @@ -12,6 +12,7 @@ "images": [ "quay.io\/parkervcp\/pterodactyl-images:base_debian" ], + "file_denylist": [], "startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", "config": { "files": "{}", @@ -21,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\" \r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1\r\n\r\nrm teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2", + "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\" \r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1", "container": "debian:buster-slim", "entrypoint": "bash" } From 3898e40fa49a288b7cd9ef35eb7be8990efc6e9c Mon Sep 17 00:00:00 2001 From: Charles Morgan Date: Sun, 16 May 2021 14:28:52 -0400 Subject: [PATCH 2/2] Add list of files being deleted to delete modal (#3299) Shows the first 15 file names being deleted. If more then 15, the first 15 will be shown then the last line will be ` + ## other(s)` --- .../components/server/files/MassActionsBar.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/scripts/components/server/files/MassActionsBar.tsx b/resources/scripts/components/server/files/MassActionsBar.tsx index 1c81573cc..5d1145fb4 100644 --- a/resources/scripts/components/server/files/MassActionsBar.tsx +++ b/resources/scripts/components/server/files/MassActionsBar.tsx @@ -74,7 +74,18 @@ const MassActionsBar = () => { onConfirmed={onClickConfirmDeletion} onModalDismissed={() => setShowConfirm(false)} > - Deleting files is a permanent operation, you cannot undo this action. + Are you sure you want to delete {selectedFiles.length} file(s)? +
+ Deleting the file(s) listed below is a permanent operation, you cannot undo this action. +
+ + { selectedFiles.slice(0, 15).map(file => ( +
  • {file}
    • )) + } + { selectedFiles.length > 15 && +
  • + {selectedFiles.length - 15} other(s)
    • + } +     {showMove &&