Commit Graph

664 Commits

Author SHA1 Message Date
Jason M. Wood
f188e905c9 msctl: only update the version_manifest file once 2017-06-13 13:06:34 -06:00
Jason M. Wood
df29679a0c Fix server start over ssh. Fixes issue #162 2017-05-19 13:06:23 -06:00
Jason M. Wood
23f9a6a5b7 Fix missing quotation marks in json-query command 2017-03-22 13:16:09 -06:00
Roflicide
1871dc96e8 Update query-json 2017-03-21 23:32:54 -04:00
Roflicide
1d9f121ce2 Fix missing quotation marks in json-query command
Performing the `query-json` command would yield the first entry in the
json "players" array missing a quotation mark; this fixes it
2017-03-21 21:24:56 -04:00
Roflicide
0ffa8a4808 Revert "Fix query-json command missing quotation marks"
This reverts commit f3ddb10637.

Woops I didn't mean to push it directly, sorry
2017-03-21 21:11:07 -04:00
Roflicide
f3ddb10637 Fix query-json command missing quotation marks 2017-03-21 21:07:49 -04:00
Jason M. Wood
1a72712227 README: add note about rsync requirement 2017-03-01 11:03:09 -07:00
Jason M. Wood
006688b95a msctl: Make sure that rsync is installed 2017-03-01 11:01:54 -07:00
Jason M. Wood
ef507426f5 Merge pull request #157 from Wicloz/master
Fix and improve the world mirrors
2017-03-01 10:58:51 -07:00
Jason M. Wood
f1d3b9d479 Merge pull request #159 from shimniok/issue158
getJavaMemory(): changed ps flag --no-headers
2017-02-22 12:09:18 -07:00
shimniok@gmail.com
c18de236e9 In getJavaMemory(), changed ps flag from '-h' to '--no-headers' to remedy incompatibility with procps (ps) version 3.2.8 on Linux Mint 13 (3.2.0-23-generic #36-Ubuntu). The --no-headers flag appears to be widely supported. 2017-02-22 10:33:52 -07:00
Wilco de Boer
781ba8c0df Make force-stop only wait the entire timeout if needed 2017-02-18 18:01:23 +01:00
Wilco de Boer
5e66871ad8 Increase force-stop timeout to 20 seconds 2017-02-18 17:56:53 +01:00
Wilco de Boer
c8a3f58822 Prevent issues with trying to modify exiting links/directories
And yes, I know there are now several if blocks that do almost the same
2017-02-18 17:44:38 +01:00
Wilco de Boer
fc7a24f655 Tweak the stop functions to not mess up the mirrors
Otherwise it synchronizes the mirror image during shutdown ...
2017-02-18 17:36:28 +01:00
Wilco de Boer
394801882f Make use of the '$WORLD_DIR' variable in 'start()' 2017-02-18 17:17:28 +01:00
Wilco de Boer
349a3f3864 Properly handle backups and mirrors 2017-02-18 17:15:56 +01:00
Wilco de Boer
7fcd1da2dd Create the mirror of the level in a much more stable way
Server crashes are handled properly by doing nothing, rather than restting the world... Also, if the mirror dissapears (ramdrive + system crash) the latest backup is autmatically restored.
2017-02-18 17:05:52 +01:00
Wilco de Boer
e992433ac7 Properly synchronize and clean up the mirror on shutdown 2017-02-18 16:57:46 +01:00
Wilco de Boer
269000cab7 Use rsync for synchronising the world image
I'm pretty sure cp -Ru doesn't delete files. This is probably faster too.
2017-02-18 16:53:45 +01:00
Wilco de Boer
4a4a72f964 Increase force stop timeout to 10 seconds 2017-02-18 16:28:53 +01:00
Jason M. Wood
c32aa93a94 Merge pull request #149 from seldonPlan/feature-adjust-mirrored-backups
Feature Request - prevent backups from copying symlink files
2017-01-14 15:03:47 -07:00
Jason M. Wood
f76aa94f96 Makefile: use install rather than cp to match wiki docs 2017-01-08 19:01:35 -07:00
Jason M. Wood
838060fc93 Makefile: remove the MSCS_HOME target
useradd takes care of creating the directory
2017-01-08 18:50:02 -07:00
Jason M. Wood
0e5a59921d Makefile: drop the MSCS_HOME target 2017-01-08 17:23:53 -07:00
Jason M. Wood
519ade9faa Merge branch 'master' into makefile-home-fix 2017-01-08 17:11:52 -07:00
Jason M. Wood
6091464560 Merge pull request #152 from sandain/patch-1
Makefile: drop the call to chown
2017-01-08 17:03:14 -07:00
Jason M. Wood
68f68aa4c6 Makefile: drop the call to chown 2017-01-08 12:04:18 -07:00
Jonas
7cdf186905 add umask permissions to useradd command 2017-01-07 23:00:28 -05:00
Jonas
4fc08701ef allow useradd to create home directory from install target, not the $(MSCS_HOME) target 2017-01-07 22:58:37 -05:00
Jason M. Wood
0599a32eb9 msctl: remove extra whitespace 2017-01-07 16:09:35 -07:00
Jonas
1c1a5292a5 check for sync resources directly instead of $MIRROR_PATH 2017-01-06 16:43:50 -05:00
Jonas
1187835b4e adjust exclude option to only look at the mirrored symlink 2017-01-06 16:40:01 -05:00
Jonas W. Carson
85536bc569 syncing changes from branch 'master' with feature-adjust-mirrored-backups 2017-01-03 14:01:38 -05:00
Jonas
9444d8e131 Merge pull request #4 from seldonPlan/bugfix-start-variable
fixing bug WORLDS_LOCATION var in start function
2017-01-03 14:00:03 -05:00
Jason M. Wood
f4039bef0c msctl: use the PERL variable 2017-01-03 11:55:12 -07:00
Jonas W. Carson
7585565438 remove symlinks from backup, added logic to start that covers an issue when starting a restored backup world 2017-01-03 13:52:07 -05:00
Jason M. Wood
75e477db3c Merge pull request #148 from seldonPlan/bugfix-start-variable
fixing bug WORLDS_LOCATION var in start function
2017-01-03 11:44:53 -07:00
Jonas
9076dddc72 fixing bug WORLDS_LOCATION var in start function 2017-01-03 13:31:13 -05:00
Jason M. Wood
c6e4b3f182 Merge pull request #145 from seldonPlan/seldonPlan-mirroring-fix
fixing bugs related to shell glob expansion and softlink behavior
2017-01-02 22:21:23 -07:00
Jonas
fab617dad9 fixing bugs related to shell glob expansion and softlink behavior 2017-01-01 22:39:12 -05:00
Jason M. Wood
3544e45b51 mscs: pass the PATH to msctl when using sudo 2016-12-21 08:32:46 -07:00
Jason M. Wood
115b41c3b2 msctl: add a check for libjson-perl 2016-12-19 10:20:00 -07:00
Jason M. Wood
01381780b5 msctl: use echo for missing program messages
I was getting a weird error when trying to print an exclamation point right before a line feed with Bash.
2016-12-19 09:54:23 -07:00
Jason M. Wood
c16068cc40 README: add heading for manual configuration 2016-11-27 15:46:25 -07:00
Jason M. Wood
0694d137c2 README: grammar 2016-10-28 12:54:10 -06:00
Jason M. Wood
89a8e1a1dc README: use the minecraft user for cron 2016-10-28 12:50:08 -06:00
Jason M. Wood
1114d44273 README: add PATH to cron 2016-10-28 12:42:07 -06:00
Jason M. Wood
fa90dba33c README: add PATH to cron 2016-10-28 12:41:22 -06:00