Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4393 commits 62 branches 124 tags 29 MiB
Commit graph

472 commits

Author SHA1 Message Date
Dane Everitt
25e53d9f22
Merge branch 'matthewpi/transfer-improvements' of https://github.com/Pterodactyl/Panel into matthewpi/transfer-improvements 2020-12-24 10:10:41 -08:00
Dane Everitt
2ee08a1a3d
Update logic for server transfer controller 2020-12-24 10:10:40 -08:00
Dane Everitt
6fa24d4979
Merge branch 'develop' into matthewpi/transfer-improvements 2020-12-24 09:17:21 -08:00
Vilhelm Prytz
2e6bb4e7ba
eggs: SpongeVanilla: update default version 
* replaced 1.11.2-6.1.0-BETA-21 with 1.12.2-7.3.0 since it is the stable and recommended build
 2020-12-22 17:48:28 +01:00
Matthew Penner
01926e2896 Improve logic for logging into the websocket of the target node 2020-12-17 10:35:54 -07:00
Matthew Penner
e6c4a68e4a Update logic for tracking a server's transfer state 2020-12-17 10:35:54 -07:00
Dane Everitt
0084b48d86
quick migration changes for refresh(ish) support; ref #2875 
This still fails in a 2017 migration, but I don't care.
 2020-12-16 20:38:21 -08:00
Dane Everitt
78c4ac80bc
Basic implemention of multiple selectable images for an egg 
The admin side of this is quite ugly when creating/editing a server, but I'm not putting effort into that right now with React Admin soon™
 2020-12-13 09:53:17 -08:00
Alex
854270e4e8 fix required version variable 
fixes required FORGE_VERSION and renames minecraft version variable to avoid confusion
 2020-12-06 17:55:41 -08:00
Michael Parker
159b977b35
update paper egg 
Updates the paper egg for 1.17 support with java 11 by default
 2020-12-06 20:53:00 -05:00
Dane Everitt
26d409c29c
Don't try to flip null values; closes #2753 2020-11-29 11:50:20 -08:00
Dane Everitt
505a9a6cbd
Update MC eggs to enable EULA feature flag 2020-11-02 20:24:24 -08:00
Dane Everitt
7618f306bd
Support functionality for per-egg features 2020-11-02 20:20:36 -08:00
Dane Everitt
200a78d77b
Don't allow null schedule names anymore; ref #2609 2020-10-26 19:57:08 -07:00
Michael (Parker) Parker
e8e2206a40
Fix install scripts (#2600) 2020-10-25 18:17:12 -07:00
Michael (Parker) Parker
3ecf14d419
fix install scripts (#2587) 2020-10-25 13:16:18 -07:00
parkervcp
d522bc9150
update install scripts 
change all install scripts to use debian:buster-slim

update mc install scripts
update steamcmd install scripts
update voice install scripts.
 2020-10-21 19:33:45 -04:00
parkervcp
16422ebf7b
remove unused eggs 2020-10-21 19:33:45 -04:00
Dane Everitt
2eccfcc1e3
Nuke existing server_transfers tables; done trying to be nice to plugin devs 2020-10-12 18:42:03 -07:00
Dane Everitt
18fce37565
Fix subuser permissions not migrating correctly from 0.7; closes #2309 2020-10-11 15:13:17 -07:00
Dane Everitt
a4d7170fac
Don't allow creation of a database with an identical name for the same server; closes #2447 2020-10-10 18:17:04 -07:00
Dane Everitt
0c2bd416ee
Fix unit tests for eggs 2020-10-05 21:29:35 -07:00
Dane Everitt
2d669a3059
Fix backups table not being removed correctly; closes #2343 2020-09-15 19:27:02 -07:00
Dane Everitt
703f55271d
Remove all references to daemon keys from the codebase 2020-09-13 11:38:42 -07:00
Dane Everitt
3c7ffaaadb
Remove all references of packs from the Panel 2020-09-13 11:13:37 -07:00
Dane Everitt
631885d60c
Handle a plugin not properly namespacing itself and causing migration errors; ref #2291 2020-09-01 20:24:25 -07:00
Dane Everitt
034a310702
Use checksum more broadly, not specifically SHA256 2020-08-23 18:06:47 -07:00
Dane Everitt
3a2c60ce31
Store bytes as unsigned bigint; closes #2245 2020-08-22 13:26:03 -07:00
Dane Everitt
e3178ba6f0
backend: support is_successful state for backups rather than deleting it when failing 
This allows the UI to correctly show failed backups to the user and require them to manually delete those backups, rather than them mysteriously disappearing.

We can also hook into this later to send a notification to the user when the backup fails.
 2020-08-20 21:07:53 -07:00
Matthew Penner
295f09ca43
Merge branch 'develop' into feature/server-mounts 2020-07-11 12:29:30 -06:00
Dane Everitt
2278927fb6
Update allocations to support ids; protect endpoints; support notes 2020-07-09 20:36:08 -07:00
Matthew Penner
29876e023b
Merge branch 'develop' into feature/server-mounts 2020-07-04 15:20:01 -06:00
Dane Everitt
c522935403
Fix logic when generating recovery codes and update migration 2020-07-02 22:11:07 -07:00
Dane Everitt
a998b463e3
Generate recovery tokens when enabling 2FA on an account 2020-07-02 21:55:25 -07:00
Dane Everitt
2ed3763d21
cs fix 2020-06-28 15:43:44 -07:00
Dane Everitt
8cfdb3acce
Add test cases for sending a command to a server 2020-06-27 12:04:41 -07:00
Dane Everitt
fc261fe20c
Add test cases for client servers endpoint 2020-06-27 10:35:02 -07:00
Dane Everitt
da39d9177e
Fix seed imports 2020-06-25 21:16:59 -07:00
Dane Everitt
536180ed0c
Return Http test cases to a passing state 2020-06-23 21:59:37 -07:00
Vilhelm Prytz
b5b02207d3
Update default value for MUMBLE_VERSION to latest version 2020-06-22 11:59:18 +02:00
Matthew Penner
0bec5b8581 Merge branch 'develop' into feature/server-mounts 2020-06-06 11:41:18 -06:00
Michael Parker
8bef5078de update forge egg 
Updates the forge egg to use the json api from forge to get versions instead of the old way of scraping the site and getting invalid jar files.

Also updates to validate download links.

Allows for setting a specific forge version
 2020-05-24 12:23:53 -04:00
Matthew Penner
e601b35f2f Fix even more StyleCI issues 2020-05-21 14:27:23 -06:00
Matthew Penner
0eb29dac9c Add mount_server table, fix wrong field type on other many to many tables, add routes for mounting and unmounting mounts on a server, finish server admin mounts page 2020-05-21 14:23:12 -06:00
Matthew Penner
34f718a8b1 Finish mount admin view page, add unique index to migration 2020-05-20 20:50:56 -06:00
Matthew Penner
77150b2551 Add increment id to mount, add basic mount view page 2020-05-20 19:17:35 -06:00
Matthew Penner
976b669059 Make StyleCI happy 2020-05-20 18:57:30 -06:00
Matthew Penner
00d1b5861a Properly setup Mount model, add database migration, get mount admin page added 2020-05-20 18:07:56 -06:00
Dane Everitt
3b2e2c63c6
Only show relevant configuration; update default path to be what the daemon expects 2020-05-09 15:44:13 -07:00
Dane Everitt
f1c3762f4d
Add base support for definining the number of backups that can be created for a server 2020-04-26 12:12:29 -07:00
Charles Morgan
941692a060
Update 2020_04_22_055500_add_max_connections_column.php 
Fix migration, not sure how I messed that up....... but 👌
 2020-04-26 11:00:38 -04:00
Dane Everitt
72ecac5236
Merge pull request #1963 from Sir3lit/maxconn 
Add Max Concurrent Connections for database users
 2020-04-25 11:01:01 -07:00
Charles Morgan
82dd7dc8e3 Allow Null = 0 
Allow Value to be nullable, will autofill 0 if value is null or 0, to facilitate "unlimited" connections.
 2020-04-23 10:45:44 -04:00
AreYouScared
f0e4764a11 Add Max Concurrent Connections for database users 
Closes #1849

Allows database users to be limited to a number of concurrent connections to prevent one user from connecting hundreds of time and bottlenecking the MySQL server.
 2020-04-22 06:00:04 -04:00
AreYouScared
21491e3aaa Allow descrition field to be optional 
Allows for Nest, Node, Location and Egg description fields to be blank / nullable.
Removed "required" wording next to them aswell
 2020-04-17 20:52:40 -04:00
Dane Everitt
3c8e9ebfa5
Update bungeecord egg 2020-04-12 16:01:20 -07:00
Dane Everitt
4ed7b26f89
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-04-12 12:22:53 -07:00
Dane Everitt
eafb0c061d
Return a less obtuse structure for config file editing 2020-04-12 12:22:50 -07:00
Dane Everitt
80bf6ba573
Merge pull request #1766 from parkervcp/update/steamcmd 
Update steamcmd install scripts
 2020-04-12 10:19:50 -07:00
Dane Everitt
72c144e309
Merge pull request #1909 from pterodactyl/enhancement/new-server-admin 
Enhancements to new server admin
 2020-04-12 10:13:03 -07:00
AreYouScared
01142d9a25
Move threads column to the 
Put column after CPU, not at the end.
 2020-04-11 23:26:23 -04:00
Matthew Penner
432e28b6bb Fix all StyleCI errors and probably break everything in the process 2020-04-11 14:07:40 -06:00
Dane Everitt
c8a78c688f
Apply unique key after assigning all of the values 2020-04-10 15:54:28 -07:00
Dane Everitt
7557dddf49
Store node daemon tokens in an encrypted manner 2020-04-10 15:15:38 -07:00
Dane Everitt
2ac82af25a
Fix migration to not require beta versions of MariaDB 2020-04-10 14:09:57 -07:00
Dane Everitt
568328596a
Cleanup migration 2020-04-10 14:02:16 -07:00
Dane Everitt
fd8b7182e7
Merge migrations 2020-04-10 14:01:36 -07:00
Matthew Penner
fd4de9168a
Merge branch 'develop' into feature/server-transfers-actually 2020-04-04 16:28:02 -06:00
Matthew Penner
142bf16aae Fix StyleCI issues 2020-04-04 16:24:58 -06:00
Matthew Penner
454ce6ce45 Add successful column to server_transfers table, get server transfers working properly :) 2020-04-04 16:16:18 -06:00
Dane Everitt
d27f0c6f2a
Basic backend support to at least store a backup model in the DB 2020-04-04 12:26:39 -07:00
Dane Everitt
9991989f89
Very basic implemention of frontend logic required to display backups and create a new one 2020-04-04 10:59:25 -07:00
Matthew Penner
86b7b6ecc3 Add Models/ServerTransfer.php 2020-04-04 11:37:44 -06:00
Dane Everitt
17ec4efd3b
Add base migration and model for server backups 2020-04-03 23:40:20 -07:00
Matthew Penner
49f0421e90 Fix issue with regex rule on 'threads' column, fix StyleCI issues on migration 2020-04-03 18:59:47 -06:00
Matthew Penner
829f05a2c7 Add migration for 'threads' column, fix errors on some admin pages, add validation rule for 'threads' column 2020-04-03 18:50:07 -06:00
Dane Everitt
32f25170f1
Pass at removing extraneous permissions table and using native MySQL JSON 2020-03-22 16:56:00 -07:00
Dane Everitt
51defae917
Merge branch 'master' into develop 2019-12-28 11:49:08 -08:00
parkervcp
a948acfd1c update vanilla minecraft script. 2019-12-25 20:38:49 -05:00
Michael (Parker) Parker
6cf338c1a5
fix server author. 2019-12-09 13:19:55 -05:00
Michael Parker
6e30f79de9 Update Install scripts 
Update steamcmd install scripts to use new install script
Update steamcmd install image to Ubuntu 18.04

Add extra ARK variables
 2019-12-08 18:31:31 -05:00
AreYouScared
9be1b658f5 MySQL 8 fix 
Fixes for users wanting to run MySQL v8+
 2019-10-15 18:28:46 -04:00
Dane Everitt
81143e231a
Merge branch 'master' into develop 2019-08-04 13:49:26 -07:00
Michael PArker
e1910e8378 remove paper query port again 
I realized after it was accepted I left in the server query.

This is to remove it.
 2019-08-01 04:53:08 -04:00
Anand Capur
625ae03632
Updated gmod egg 
Co-Authored-By: rtm516 <rtm516@users.noreply.github.com>
 2019-07-31 22:55:32 -07:00
Michael (Parker) Parker
258c27e08d
fix paper image 2019-07-30 14:41:47 -04:00
Michael (Parker) Parker
de98924ddd
update paper install script 
This is due to parkervcp/eggs#260

I added it after on my own eggs repo.
 2019-07-30 14:39:07 -04:00
NgLoader
5e7b6ebbb4 Added forge build number support (#1479) 
* Fixed forge script and added build number support

* Changed regex

Thanks to @parkervcp
 2019-07-26 11:07:32 -04:00
Anand Capur
09f2d538fa update teamspeak egg (closes #1628) 
Co-authored-by: Michael (Parker) Parker <parkervcp@gmail.com>
 2019-07-26 00:41:30 -04:00
Anand Capur
a150790630 update insurgency steam app id (closes #1602) 
Co-authored-by: Richard Moore <rmooreau@outlook.com>
 2019-07-26 00:37:15 -04:00
Michael (Parker) Parker
d700fdbe7d update teamspeak egg (#1607) 
use a debian based image instead due to glibc issues

resolves #1606
 2019-06-12 15:29:39 -07:00
TonisGen
3290d39863 update egg-teamspeak3-server.json (#1575) 
* delete ts3 egg

* update egg-teamspeak3-server.json
 2019-05-01 23:02:41 -04:00
Havila
fa2fad73dc Update egg-garrys-mod.json (#1483) 2019-03-02 16:02:22 -08:00
Dane Everitt
8253246955
Prevent an exception when creating databases with the same name on multiple hosts. 
closes #1456
 2019-03-02 15:31:25 -08:00
Dane Everitt
a4d7985e51
[#1500] Fix allocation limit being required even though it isn't used. 2019-03-02 14:27:01 -08:00
Michael (Parker) Parker
807d075435 Replace Spigot with Paper (#1501) 
Replace Spigot as the default server with plugin support with paper.

Paper can be freely downloaded without the need to build the server jar every time.

This egg still allows for the download like to be supplied to download whatever jar a user wants.
 2019-03-02 13:22:22 -08:00
Michael (Parker) Parker
edcea40eab Fix ARK startup config (#1481) 
Changes the ARK startup config to actually set the server to running.
 2019-02-16 11:08:54 -08:00
Sir3lit
805e895e8e Update installers to use latest Alpine (#1469) 2019-02-16 11:08:01 -08:00
Michael (Parker) Parker
10c7816f39 Fix for stupid forge version grabbing. (#1471) 
* Fix for stupid forge version grabbing.

* Needed to correct both version catches.
 2019-02-16 11:07:35 -08:00
Michael (Parker) Parker
33dc84f951 Fix Forge Install Container 
frolvlad's oraclejdk image died and the stock openjdk image works fine for this,
 2019-01-22 23:50:38 -05:00
Cristi
7b7e2086b8
Added missing option for auto-save interval 
Also I'm not sure why the default port was set to 8401.
The default port for RCON is 28016.
 2019-01-01 11:56:23 +01:00
Dane Everitt
7826078ebb
Merge pull request #1408 from zKoz210/patch-2 
Fixed the class name in the constructor
 2018-12-19 08:47:27 -08:00
Sir3lit
cf8c5c6604
Use https 
Changed URL's to use https, as forge's website doesn't redirect to https
 2018-12-18 03:44:52 -05:00
Sir3lit
3f19d2ba7b
Fixed grep regex 
regex had an extra bracket `]` causing it to not match anything.
 2018-12-18 03:36:41 -05:00
Oreo Oreoniv
0b37c74875
Fixed the class name in the constructor 2018-12-08 15:05:58 +03:00
Fabian
c35cdafc55
Updated TS3 Server version 
Just updated to the latest TS3 Server version
 2018-12-02 23:13:11 +01:00
Sir3lit
531029b534
Fixed building of older versions 
Older versions of spigot used "bash" during the install,  added `bash` package
 2018-11-16 02:16:19 -05:00
Fabian
34ff6511a6
Remove \r 
Removed \r
 2018-10-28 21:13:03 +01:00
Fabian
10f37adca8
Updated Teamspeak 3 Server Egg 
Changed to alpine container
 2018-10-28 20:51:36 +01:00
Fabian
f5d701cbc8
Updated TS3 Server egg 
New minimal Script based on bash.
ts3server.ini is not needed, because its only used when the server get started with the inifile=ts3server.ini parameter.
Also the license aggrement moved to the parameter.
 2018-10-28 20:34:56 +01:00
Sir3lit
80839f3397
Update to latest version 
Use latest version to prevent issues with invalid licensekey.dat file
 2018-10-13 04:14:17 -04:00
Dane Everitt
e404918bff
Dont limit length of variable values, closes #1264 2018-09-03 14:43:05 -07:00
ViViV_
ac71a56fd1 Adding variable for Server Map Selection [ARK SERVER] (#1230) 2018-07-21 10:40:51 -07:00
Dane Everitt
1df3efdfb0
Fix eggs (#1224) 2018-06-30 18:52:32 -07:00
Dane Everitt
969b16a563 Apply fixes from StyleCI 
[ci skip] [skip ci]
 2018-06-02 21:32:26 +00:00
stanjg
013dde75ae
Renamed the field and made some improvements 2018-05-31 16:34:35 +02:00
Dane Everitt
e3bbd85f3f
Merge branch 'develop' into pr/1129 2018-05-26 10:34:29 -07:00
Michael (Parker) Parker
52ae3f1062 Parkervcp patch 1 (#1169) 2018-05-23 22:00:57 -07:00
Michael (Parker) Parker
5fddf02247 Update to build spigot (#1168) 2018-05-23 21:58:16 -07:00
Jakob
4d91cc697b no longer lie about spigot being built when no url provided (#1104) 2018-05-23 21:38:39 -07:00
stanjg
86c8ecdcdf
Added the actual logic 2018-05-04 15:02:51 +02:00
Lance Pioch
88fd83d413 Remove unused imports (#1102) 2018-04-08 15:37:27 -05:00
Dane Everitt
68f0811273
Merge branch 'feature/api-integration-testing' into develop 2018-03-26 19:55:28 -05:00
Stan
f1a76ec7fd Add description field to nodes (#1065) 2018-03-26 13:57:24 -05:00
Dane Everitt
bde4d4187f
Merge branch 'develop' into feature/api-integration-testing 2018-03-21 22:25:16 -05:00
William Cody Ardoin
0c07577d3b Allow for 3 decimals, future proof (#999) 
The GET_VERSIONS Grep Command will fail with 1.12.2 but will work with 1.12. Added optional check for 3rd decimal place in the MC Version of Forge and future proofed the forge version for Double Numeric SubMinor version.
 2018-03-06 23:11:58 -06:00
arajdon
1d623a319b Update Teamspeak 3.1.1 (#1022) 
Added "\n\ntouch \/mnt\/server\/.ts3server_license_accepted" and changed version number.
I've tested this changes on my installation. Works fine.

Thats my first PR. Hope thats ok so.
 2018-03-06 23:11:05 -06:00
Dane Everitt
e8ea218f20
Add integration test for remaining application api user endpoints 2018-03-04 22:35:57 -06:00
Dane Everitt
9905358bc3
Add integration tests for remote user endpoint 2018-03-04 16:56:05 -06:00
Dane Everitt
e2aa01c9cc
First go at integration tests 2018-03-04 16:30:16 -06:00
Dane Everitt
89db9390df
Fix broken migration rollbacks 2018-03-04 15:21:54 -06:00
Dane Everitt
aaccf38640
Merge branch 'develop' into feature/user-databases 2018-03-02 18:40:38 -06:00
Dane Everitt
d03559080f
Theoretically fix migration issues for api_key table 2018-03-02 18:37:39 -06:00
Dane Everitt
87b96bdfc8
Add core logic to allow for limited databases and allocations 2018-03-01 20:08:27 -06:00
Dane Everitt
aa08498d51
Formatting fix 2018-02-25 16:10:28 -06:00
Dane Everitt
4cfb8941d5
Fix broken users table in database causing validation errors. 2018-02-25 16:08:01 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975 2018-02-24 11:57:12 -06:00
Dane Everitt
d86c35d80f
Prevent duplicate allocations for servers 2018-02-17 13:53:38 -06:00
Dane Everitt
c3dc376c4c
Fixes #921 2018-02-10 15:58:34 -06:00
William Cody Ardoin
e1d6980c0b Add the MAP Varible (#903) 
The MAP Var was added to startup config but never to the user config options.
 2018-02-09 18:50:56 -06:00
Dane Everitt
2ec76d283b
Fix bad API behavior 2018-02-04 15:38:38 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic 2018-01-25 21:26:06 -06:00
Dane Everitt
407120a854
Merge branch 'develop' into feature/api-v1 2018-01-21 17:06:31 -06:00
Dane Everitt
655d2485b5
Fix error causing inability to save variables. 2018-01-21 17:02:25 -06:00
Dane Everitt
c3b9738364
Implement application API Keys 2018-01-18 21:36:15 -06:00
Dane Everitt
d0bce4af97
Apply fixes from StyleCI (#875) 
[ci skip] [skip ci]
 2018-01-14 12:07:14 -06:00
Dane Everitt
ad3a954256
Rename APIKey to ApiKey 2018-01-14 12:06:15 -06:00
Dane Everitt
7aa540b895
Remove api permissions table 2018-01-14 12:05:18 -06:00
Dane Everitt
8e8147cc43
Apply fixes from StyleCI (#874) 
[ci skip] [skip ci]
 2018-01-13 16:06:55 -06:00
Dane Everitt
e3df0738da
Change the way API keys are stored and validated; clarify API namespacing 
Previously, a single key was used to access the API, this has not changed in terms of what the user sees. However, API keys now use an identifier and token internally. The identifier is the first 16 characters of the key, and the token is the remaining 32. The token is stored encrypted at rest in the database and the identifier is used by the API middleware to grab that record and make a timing attack safe comparison.
 2018-01-13 16:06:19 -06:00