Commit Graph

1107 Commits

Author SHA1 Message Date
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
Andrew
3373d6035c Merge branch 'download-status' into 'dev'
Add server download status indicator

See merge request crafty-controller/crafty-commander!181
2022-03-04 00:36:36 +00:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Andrew
6bc5e5b51f Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-03-02 18:35:58 -05:00
Andrew
761653ac25 Increase realtime stats frequency 2022-03-02 18:35:53 -05:00
Iain Powrie
ea2d115b14 Merge branch 'documentation/docker-warnings' into 'dev'
Documentation/docker warnings

See merge request crafty-controller/crafty-commander!180
2022-03-02 21:16:40 +00:00
Iain Powrie
82cbd4d9bc Documentation/docker warnings 2022-03-02 21:16:40 +00:00
Iain Powrie
8da2bcae17 Merge branch 'devops/userns-rootless-container' into 'dev'
Convert container to run as non-root

See merge request crafty-controller/crafty-commander!172
2022-03-02 19:47:41 +00:00
Zedifus
ef37afd630 Update documentation for docker updates 2022-03-02 19:27:42 +00:00
Andrew
5efc3c6dac Merge branch 'clear-comms' into 'dev'
Add unexecuted clear. Add option to compress backups

See merge request crafty-controller/crafty-commander!179
2022-03-02 19:15:46 +00:00
Andrew
6cf778f068 appease the linter 2022-03-02 13:07:00 -05:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Zedifus
69e85faa1a Merge branch 'dev' into devops/userns-rootless-container
[RESOLVED CONFLICTS]
2022-03-02 16:58:48 +00:00
Zedifus
3e39463e27 Fix sighandler args > sig, args defined elsewhere 2022-03-02 16:50:44 +00:00
Zedifus
a871e09994 Appease lint
User args for something
2022-03-02 16:44:30 +00:00
Andrew
fec877db7b Merge branch 'improve-session-lock' into 'dev'
Improve session.lock checking. Add option to disable language files. Add option to compress backups

See merge request crafty-controller/crafty-commander!178
2022-03-02 16:37:30 +00:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Zedifus
8f0ac0d025 Fix permissions setting on bedrock imports
This is not an issue on java as we dont need the execute perm on .jar's
Requires to be prefix'd octal intager for mask not decimal
2022-03-02 16:22:53 +00:00
Andrew
15610210b9 Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key 2022-03-02 10:49:03 -05:00
Andrew
7707940743 Appease the linter 2022-03-02 10:36:24 -05:00
Andrew
8e874ca997 Add option to disable language files through config.json 2022-03-02 10:30:40 -05:00
Andrew
826d4d081f Improve session.lock checking. 2022-03-02 09:48:03 -05:00
Zedifus
7be5cfa449 Fix config check in wrapper
.gitkeep was making the wrapper think config was present on fresh boot..
Whoops!
2022-03-02 13:28:36 +00:00
Andrew
e711856cc9 Remove docker exemption from root check 2022-03-02 08:12:03 -05:00
Andrew
061f148166 Merge branch 'devops/userns-rootless-container' of https://gitlab.com/crafty-controller/crafty-commander into devops/userns-rootless-container 2022-03-02 08:10:59 -05:00
Andrew
e2f226a6c3 Attempted fix for daemon sigterm by accepting all args in the sigterm handler 2022-03-02 08:10:49 -05:00
Zedifus
c6b3210fdf Add final working docker config, root group 2022-03-02 05:16:45 +00:00
Zedifus
876d178daa Add config and import dirs, so perms dont go funky 2022-03-02 05:11:11 +00:00
Andrew
23641f4033 Fix for keyerror when mc server can't be polled early enough 2022-03-01 22:45:44 -05:00
Andrew
c8267bee80 Catch key error players for stats - silently log it. Fix for human readable file size 2022-03-01 22:30:53 -05:00
Andrew
983022c5bb make file size calc more efficient 2022-03-01 22:14:50 -05:00
Andrew
18283cf2b3 Fix front end for removing world 2022-03-01 21:56:12 -05:00
Andrew
c3e23358a0 Merge branch 'remove-world' into 'dev'
Remove minecraft specific naming/stats

See merge request crafty-controller/crafty-commander!177
2022-03-02 02:47:55 +00:00
Andrew
322134506b Remove minecraft specific naming/stats 2022-03-01 21:43:36 -05:00
amcmanu3
e99f06ba9f remove print statement 2022-03-01 19:57:02 -05:00
Andrew
f30fcbfdcb Merge branch 'raknet-ping-fix' into 'dev'
Expand except to be more general to catch windows connection forcibly closed error

See merge request crafty-controller/crafty-commander!176
2022-03-02 00:50:41 +00:00
amcmanu3
de3ec1fa3b Expand except to be more general to catch windows connection forcibly closed error 2022-03-01 19:47:29 -05:00
Andrew
bbe9321516 Merge branch 'bedrock-fixes' into 'dev'
Added translation for backup start/end messages. Finalize bedrock support....

See merge request crafty-controller/crafty-commander!175
2022-03-02 00:32:29 +00:00
Andrew
00db762c51 Add check in server import so we don't stack if jar doesn't exist. 2022-03-01 19:29:08 -05:00
Andrew
19f8775b32 Fix traceback when importing regular server 2022-03-01 18:49:16 -05:00
Andrew
c8c1f301c0 Fix server importing for bedrock that's not a zip 2022-03-01 18:31:38 -05:00
Andrew
e1340d61ff Appease the linter 2022-03-01 17:10:04 -05:00
Andrew
5d6ada23a4 Fix visual file loading order. Fix zip imports where directories were not being copied 2022-03-01 16:54:06 -05:00
Zedifus
53b2b2ed4b Revert my last commit correctly
Man these are so getting squashed
2022-03-01 20:20:17 +00:00
Zedifus
b5f6e3587f Merge branch 'devops/userns-rootless-container' of https://gitlab.com/crafty-controller/crafty-commander into devops/userns-rootless-container 2022-03-01 20:15:53 +00:00
Zedifus
326f5aa78d Revert my last commit 2022-03-01 20:14:53 +00:00
Andrew
10d3afab58 Fix bug where int mc ping was not defined for bedrock servers 2022-03-01 13:52:57 -05:00
Andrew
11bf44b35e Add user feedback for wrong unzip path 2022-03-01 13:27:41 -05:00
Andrew
22d519b4df Remove print statements 2022-03-01 12:59:08 -05:00
Andrew
bbddbbf646 Patch issue where guid was a string trying to be made into bytes 2022-03-01 12:58:39 -05:00