69e85faa1a
Merge branch 'dev' into devops/userns-rootless-container
...
[RESOLVED CONFLICTS]
2022-03-02 16:58:48 +00:00
3e39463e27
Fix sighandler args > sig, args defined elsewhere
2022-03-02 16:50:44 +00:00
a871e09994
Appease lint
...
User args for something
2022-03-02 16:44:30 +00:00
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
e0b8fb35fe
Add option to compress backups
2022-03-02 11:34:26 -05:00
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
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
7707940743
Appease the linter
2022-03-02 10:36:24 -05:00
8e874ca997
Add option to disable language files through config.json
2022-03-02 10:30:40 -05:00
826d4d081f
Improve session.lock checking.
2022-03-02 09:48:03 -05:00
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
e711856cc9
Remove docker exemption from root check
2022-03-02 08:12:03 -05:00
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
e2f226a6c3
Attempted fix for daemon sigterm by accepting all args in the sigterm handler
2022-03-02 08:10:49 -05:00
c6b3210fdf
Add final working docker config, root group
2022-03-02 05:16:45 +00:00
876d178daa
Add config and import dirs, so perms dont go funky
2022-03-02 05:11:11 +00:00
23641f4033
Fix for keyerror when mc server can't be polled early enough
2022-03-01 22:45:44 -05:00
c8267bee80
Catch key error players for stats - silently log it. Fix for human readable file size
2022-03-01 22:30:53 -05:00
983022c5bb
make file size calc more efficient
2022-03-01 22:14:50 -05:00
18283cf2b3
Fix front end for removing world
2022-03-01 21:56:12 -05:00
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
322134506b
Remove minecraft specific naming/stats
2022-03-01 21:43:36 -05:00
e99f06ba9f
remove print statement
2022-03-01 19:57:02 -05:00
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
de3ec1fa3b
Expand except to be more general to catch windows connection forcibly closed error
2022-03-01 19:47:29 -05:00
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
00db762c51
Add check in server import so we don't stack if jar doesn't exist.
2022-03-01 19:29:08 -05:00
19f8775b32
Fix traceback when importing regular server
2022-03-01 18:49:16 -05:00
c8c1f301c0
Fix server importing for bedrock that's not a zip
2022-03-01 18:31:38 -05:00
e1340d61ff
Appease the linter
2022-03-01 17:10:04 -05:00
5d6ada23a4
Fix visual file loading order. Fix zip imports where directories were not being copied
2022-03-01 16:54:06 -05:00
53b2b2ed4b
Revert my last commit correctly
...
Man these are so getting squashed
2022-03-01 20:20:17 +00:00
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
326f5aa78d
Revert my last commit
2022-03-01 20:14:53 +00:00
10d3afab58
Fix bug where int mc ping was not defined for bedrock servers
2022-03-01 13:52:57 -05:00
11bf44b35e
Add user feedback for wrong unzip path
2022-03-01 13:27:41 -05:00
22d519b4df
Remove print statements
2022-03-01 12:59:08 -05:00
bbddbbf646
Patch issue where guid was a string trying to be made into bytes
2022-03-01 12:58:39 -05:00
d760fcb010
Appease the linter
2022-03-01 01:14:26 -05:00
11278ebe5f
Added translation for backup start/end messages. Finalize bedrock support. Removed confusion so server stats won't be shown if server isn't running.
2022-03-01 00:33:09 -05:00
fbe9a7659d
Few updates to MC bedrock ping
2022-02-28 22:57:16 -05:00
3c48364998
BEDROCK SUPPORT. Ping works. Add notification for backups starting and completing.
2022-02-28 22:40:11 -05:00
2e549cea60
Merge branch 'backup-fixes' into 'dev'
...
Rework of files handling and added exclusions selection for backups.
See merge request crafty-controller/crafty-commander!174
2022-03-01 01:02:30 +00:00
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
98c0c403c9
Investigating a different approach of non root
...
These commits are 100% getting squashed.
Just got to test this on my production machine.
Definitely not sure if this is the right way of doing it experimenting.
2022-02-28 20:01:14 +00:00
26014d0e86
Revert "Merge branch 'xithical-fixes' into 'dev'"
...
This reverts merge request !173
2022-02-28 04:40:33 +00:00
1a0e8176e3
Merge branch 'xithical-fixes' into 'dev'
...
Add option to exclude files/folders from backups
See merge request crafty-controller/crafty-commander!173
2022-02-28 04:11:47 +00:00
10bf19bdf1
QOL changes for markup
2022-02-27 23:02:07 -05:00
f563ceb8ad
Fix delete backup
2022-02-27 22:45:22 -05:00
7f98e39503
Appease the linter
2022-02-27 21:25:00 -06:00
