From 7ecf4923fe6a431df812d92775d843328f458bb0 Mon Sep 17 00:00:00 2001 From: Blaine Motsinger Date: Sat, 2 Jan 2021 08:41:19 -0600 Subject: [PATCH 1/5] Update ownership command for msm dir Issue #396 --- docs/installation.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 0842912..15e9553 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -38,18 +38,18 @@ Manual Installation First create the folder where MSM will store server, jars, and other files: - sudo mkdir /opt/msm + sudo mkdir -p /opt/msm Second, add the user and set permissions sudo useradd minecraft --home /opt/msm - sudo chown minecraft /opt/msm + sudo chown -R minecraft:minecraft /opt/msm sudo chmod -R 775 /opt/msm If you want to store your world folders in RAM for a performance boost, create this directory in ramdisk (`/dev/shm` is the default in Ubuntu): sudo mkdir /dev/shm/msm - sudo chown minecraft /dev/shm/msm + sudo chown -R minecraft:minecraft /dev/shm/msm sudo chmod -R 775 /dev/shm/msm 4. Download the MSM script and place it in `/etc/init.d`: From 4f144b9aeba443e406e068b5f74198ab60e7ed8b Mon Sep 17 00:00:00 2001 From: Blaine Motsinger Date: Sat, 2 Jan 2021 08:56:49 -0600 Subject: [PATCH 2/5] Update msmhq links --- docs/commands/index.md | 2 +- docs/concepts/cron.md | 2 +- docs/configuration/msm.md | 4 ++-- docs/configuration/server.md | 4 ++-- docs/index.html | 6 +++--- docs/installation.md | 6 +++--- docs/updating.md | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/commands/index.md b/docs/commands/index.md index 636650c..9ba6b38 100644 --- a/docs/commands/index.md +++ b/docs/commands/index.md @@ -84,4 +84,4 @@ You can always get a quick list of commands by typing `msm help`, which outputs [survival]: https://www.minecraftwiki.net/wiki/Survival [creative]: https://www.minecraftwiki.net/wiki/Creative [we-snapshots]: https://wiki.sk89q.com/wiki/WorldEdit/Snapshots -[active-vs-inactive]: https://github.com/marcuswhybrow/minecraft-server-manager/wiki/Active-vs-Inactive-Servers +[active-vs-inactive]: https://github.com/msmhq/msm/wiki/Active-vs-Inactive-Servers diff --git a/docs/concepts/cron.md b/docs/concepts/cron.md index 81febe0..53d9470 100644 --- a/docs/concepts/cron.md +++ b/docs/concepts/cron.md @@ -14,4 +14,4 @@ From wikipedia: MSM uses cron to run periodical backups, syncronise worlds that are in RAM back to disk every half hour to prevent data loss in the event of a crash and roll Minecraft log files to prevent them getting too large each night. -See the MSM cron file in the repository for a detailed example. \ No newline at end of file +See the MSM cron file in the repository for a detailed example. diff --git a/docs/configuration/msm.md b/docs/configuration/msm.md index e2f087f..5c3fddf 100644 --- a/docs/configuration/msm.md +++ b/docs/configuration/msm.md @@ -24,7 +24,7 @@ Default Values MSM has default values for all possible settings. This means that `/etc/msm.conf` could be left blank and MSM would still work with sensible defaults. -It is however advised that each value be explicitly defined nonetheless, allowing admins to be sure of what MSM is doing. The installation documentation encourages this approach by downloading the msm.conf file ready with default values. +It is however advised that each value be explicitly defined nonetheless, allowing admins to be sure of what MSM is doing. The installation documentation encourages this approach by downloading the msm.conf file ready with default values. Server Defaults --------------- @@ -38,4 +38,4 @@ Path values can be absolute (starts with a forward slash) or relative (does not All other path settings must be absolute, these include the general MSM settings such as where to store all servers, backups and logs. -Paths must **never** have a trailing slash. In other words `/opt/msm/servers` is OK but `/opt/msm/servers/` is not. \ No newline at end of file +Paths must **never** have a trailing slash. In other words `/opt/msm/servers` is OK but `/opt/msm/servers/` is not. diff --git a/docs/configuration/server.md b/docs/configuration/server.md index c48d1f5..1874ece 100644 --- a/docs/configuration/server.md +++ b/docs/configuration/server.md @@ -50,7 +50,7 @@ MSM selects, using this code, the most appropiate included versioning file, so t If you are running a unique server type, maybe Tekkit for instance, pick the closest available version. Or let me know, by [creating an issue][issues], that you think MSM should accomodate it. -[issues]: https://github.com/marcuswhybrow/minecraft-server-manager/issues/ +[issues]: https://github.com/msmhq/msm/issues/ ## Delays @@ -72,4 +72,4 @@ When interruptions to the normal experience occur, it's nice to give players som msm-message-complete-backup-started= # The message shown to players when starting to backup the entire server msm-message-complete-backup-finished= # The message shown to players when finished backing up the entire server -[global-config]: {{ site.baseurl }}/docs/configuration/msm.html \ No newline at end of file +[global-config]: {{ site.baseurl }}/docs/configuration/msm.html diff --git a/docs/index.html b/docs/index.html index 3095f37..a704769 100644 --- a/docs/index.html +++ b/docs/index.html @@ -7,7 +7,7 @@ docsitem: home

Getting Started

-

If you're looking to get going see the Install guide, then peruse the commands. After that maybe watch the project for updates on GitHub and join the MSM community.

+

If you're looking to get going see the Install guide, then peruse the commands. After that maybe watch the project for updates on GitHub and join the MSM community.

Contributing to this Documentation -

If there is something in this documentation which you thinks needs changing, now you can change it by forking gh-pages and sending a pull request.

+

If there is something in this documentation which you thinks needs changing, now you can change it by forking gh-pages and sending a pull request.

-

Equally if there is something which you do not understand post an issue and I will help you out and update the documentation to better prevent confusion in the future.

+

Equally if there is something which you do not understand post an issue and I will help you out and update the documentation to better prevent confusion in the future.

diff --git a/docs/installation.md b/docs/installation.md index 15e9553..e7e328a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -124,7 +124,7 @@ If stuck, you can always type `msm help` for a quick list of all commands, or if [config]: {{ site.baseurl }}/docs/configuration/ [cron]: {{ site.baseurl }}/docs/concepts/cron.html [commands]: {{ site.baseurl }}/docs/commands/ -[#26]: https://github.com/marcuswhybrow/minecraft-server-manager/issues/26 -[versions]: https://github.com/marcuswhybrow/minecraft-server-manager/blob/latest/versioning/versions.txt +[#26]: https://github.com/msmhq/msm/issues/26 +[versions]: https://github.com/msmhq/msm/blob/latest/versioning/versions.txt [layout]: {{ site.baseurl }}/docs/concepts/layout.html -[issues]: https://github.com/marcuswhybrow/minecraft-server-manager/issues +[issues]: https://github.com/msmhq/msm/issues diff --git a/docs/updating.md b/docs/updating.md index 7cf1807..8ff9a72 100644 --- a/docs/updating.md +++ b/docs/updating.md @@ -18,7 +18,7 @@ Updating From Pre 0.8.0 If you are upgrading from a version of MSM that does not have the update command, you will have to do one thing by hand. Download and replace your MSM script file with the latest version: - sudo wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/init/msm -O /etc/init.d/msm + sudo wget https://raw.github.com/msmhq/msm/latest/init/msm -O /etc/init.d/msm Then just call the `sudo msm update` command to get all the other files automatically. @@ -28,4 +28,4 @@ Check Your Version sudo msm version -The version command will return the current MSM version you have installed, useful for checking the upgrade was successful. \ No newline at end of file +The version command will return the current MSM version you have installed, useful for checking the upgrade was successful. From e93152bd454efc2b8e75af028fa8a598f93948b6 Mon Sep 17 00:00:00 2001 From: Blaine Motsinger Date: Sat, 2 Jan 2021 08:59:37 -0600 Subject: [PATCH 3/5] Update old github wiki link --- docs/commands/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/commands/index.md b/docs/commands/index.md index 9ba6b38..48ac569 100644 --- a/docs/commands/index.md +++ b/docs/commands/index.md @@ -84,4 +84,4 @@ You can always get a quick list of commands by typing `msm help`, which outputs [survival]: https://www.minecraftwiki.net/wiki/Survival [creative]: https://www.minecraftwiki.net/wiki/Creative [we-snapshots]: https://wiki.sk89q.com/wiki/WorldEdit/Snapshots -[active-vs-inactive]: https://github.com/msmhq/msm/wiki/Active-vs-Inactive-Servers +[active-vs-inactive]: {{ site.baseurl }}/docs/concepts/active-vs-inactive.html From 52914d9f6fb899cc5f91575c82ce2470bfad4b96 Mon Sep 17 00:00:00 2001 From: Blaine Motsinger Date: Sat, 2 Jan 2021 09:45:39 -0600 Subject: [PATCH 4/5] Update msmhq links --- assets/js/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/index.js b/assets/js/index.js index f024e8b..6685d77 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -1,8 +1,8 @@ $(function() { - var milestonesUrl = "https://api.github.com/repos/marcuswhybrow/minecraft-server-manager/milestones?callback=?", - tagsUrl = "https://api.github.com/repos/marcuswhybrow/minecraft-server-manager/tags?callback=?" - stargazersUrl = "https://api.github.com/repos/marcuswhybrow/minecraft-server-manager/stargazers?per_page=100&callback=?", - contributorsUrl = "https://api.github.com/repos/marcuswhybrow/minecraft-server-manager/contributors?per_page=100&callback=?"; + var milestonesUrl = "https://api.github.com/repos/msmhq/msm/milestones?callback=?", + tagsUrl = "https://api.github.com/repos/msmhq/msm/tags?callback=?" + stargazersUrl = "https://api.github.com/repos/msmhq/msm/stargazers?per_page=100&callback=?", + contributorsUrl = "https://api.github.com/repos/msmhq/msm/contributors?per_page=100&callback=?"; var maintainers = [ "marcuswhybrow", @@ -113,7 +113,7 @@ $(function() { var $div = $("
").addClass("milestone"); var $link = $("") - .attr("href", "https://github.com/marcuswhybrow/minecraft-server-manager/issues?state=open&milestone=" + milestone.number) + .attr("href", "https://github.com/msmhq/msm/issues?state=open&milestone=" + milestone.number) .addClass("ga-track") .appendTo($div); $("

").text(milestone.title).appendTo($link); From e0e4a0703c71758a1e91f6afd37e981aa8320474 Mon Sep 17 00:00:00 2001 From: Blaine Motsinger Date: Sat, 2 Jan 2021 09:46:22 -0600 Subject: [PATCH 5/5] Remove google analytics --- assets/js/index.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/assets/js/index.js b/assets/js/index.js index 6685d77..8ac967d 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -167,9 +167,4 @@ $(function() { $('.donator').tooltip({ placement: 'bottom', }); - - $('a.ga-track').live('click', function() { - var $this = $(this); - _gaq.push(['_trackEvent', 'External Link', $this.text(), $this.attr('href')]); - }); });