Skip to content

Commit 982ed4e

Browse files
docs(wiki): fix typos, improve formatting/readability (#129)
* docs(wiki): add lazymc readme link * docs(wiki): improve readability, formatting, typos - fixed some of the formatting around the wiki (a few lists weren't displaying correctly, long paragraphs that look like they were intended to be split over multiple lines, etc) - fixed several typos, mainly with the word "dependencies". Plus some grammar/punctuation while I was in there - removed quite a few unnecessary whitespaces that do not effect the page layout/formatting - fixed up some links that were either not linking, or had poor use of "[example.tld](https://example.tld)" (like quoting the whole target URL inside the link text instead of using `<https://example.tld>`?) * Update Gemfile.lock first time ruby user and project contributor here, not really sure if this is "ok" or not? if you want this commit removed from the PR im more than happy to do so. happened after running `bundle update`, which it seemed like I needed to do to get the webserver running, because of a missing dependency that bundle could not locate (missing/removed) err msg: ``` Your bundle is locked to ffi (1.15.5-x64-mingw-ucrt) from rubygems repository https://rubygems.org/ or installed locally, but that version can no longer be found in that source ``` * Update community/Chat.md --------- Co-authored-by: Lukas Rieger <[email protected]>
1 parent 3e0ff68 commit 982ed4e

18 files changed

+272
-252
lines changed

Gemfile.lock

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,98 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.3.0)
7+
bigdecimal (3.2.2)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.5)
811
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
1013
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.15.5)
13-
ffi (1.15.5-x64-mingw-ucrt)
15+
ffi (1.17.2-arm64-darwin)
16+
ffi (1.17.2-x64-mingw-ucrt)
17+
ffi (1.17.2-x86_64-darwin)
18+
ffi (1.17.2-x86_64-linux-gnu)
1419
forwardable-extended (2.6.0)
20+
google-protobuf (4.31.1-arm64-darwin)
21+
bigdecimal
22+
rake (>= 13)
23+
google-protobuf (4.31.1-x64-mingw-ucrt)
24+
bigdecimal
25+
rake (>= 13)
26+
google-protobuf (4.31.1-x86_64-darwin)
27+
bigdecimal
28+
rake (>= 13)
29+
google-protobuf (4.31.1-x86_64-linux-gnu)
30+
bigdecimal
31+
rake (>= 13)
1532
http_parser.rb (0.8.0)
16-
i18n (1.12.0)
33+
i18n (1.14.7)
1734
concurrent-ruby (~> 1.0)
18-
jekyll (4.3.0)
35+
jekyll (4.4.1)
1936
addressable (~> 2.4)
37+
base64 (~> 0.2)
2038
colorator (~> 1.0)
39+
csv (~> 3.0)
2140
em-websocket (~> 0.5)
2241
i18n (~> 1.0)
2342
jekyll-sass-converter (>= 2.0, < 4.0)
2443
jekyll-watch (~> 2.0)
44+
json (~> 2.6)
2545
kramdown (~> 2.3, >= 2.3.1)
2646
kramdown-parser-gfm (~> 1.0)
2747
liquid (~> 4.0)
28-
mercenary (>= 0.3.6, < 0.5)
48+
mercenary (~> 0.3, >= 0.3.6)
2949
pathutil (~> 0.9)
3050
rouge (>= 3.0, < 5.0)
3151
safe_yaml (~> 1.0)
3252
terminal-table (>= 1.8, < 4.0)
3353
webrick (~> 1.7)
34-
jekyll-sass-converter (2.2.0)
35-
sassc (> 2.0.1, < 3.0)
54+
jekyll-sass-converter (3.1.0)
55+
sass-embedded (~> 1.75)
3656
jekyll-seo-tag (2.8.0)
3757
jekyll (>= 3.8, < 5.0)
3858
jekyll-watch (2.2.1)
3959
listen (~> 3.0)
60+
json (2.13.2)
4061
just-the-docs (0.4.1)
4162
jekyll (>= 3.8.5)
4263
jekyll-seo-tag (>= 2.0)
4364
rake (>= 12.3.1)
44-
kramdown (2.4.0)
45-
rexml
65+
kramdown (2.5.1)
66+
rexml (>= 3.3.9)
4667
kramdown-parser-gfm (1.1.0)
4768
kramdown (~> 2.0)
48-
liquid (4.0.3)
49-
listen (3.7.1)
69+
liquid (4.0.4)
70+
listen (3.9.0)
5071
rb-fsevent (~> 0.10, >= 0.10.3)
5172
rb-inotify (~> 0.9, >= 0.9.10)
5273
mercenary (0.4.0)
5374
pathutil (0.16.2)
5475
forwardable-extended (~> 2.6)
55-
public_suffix (5.0.0)
56-
rake (13.0.6)
76+
public_suffix (6.0.2)
77+
rake (13.3.0)
5778
rb-fsevent (0.11.2)
58-
rb-inotify (0.10.1)
79+
rb-inotify (0.11.1)
5980
ffi (~> 1.0)
60-
rexml (3.3.9)
61-
rouge (4.0.0)
81+
rexml (3.4.1)
82+
rouge (4.6.0)
6283
safe_yaml (1.0.5)
63-
sassc (2.4.0)
64-
ffi (~> 1.9)
84+
sass-embedded (1.89.2-arm64-darwin)
85+
google-protobuf (~> 4.31)
86+
sass-embedded (1.89.2-x64-mingw-ucrt)
87+
google-protobuf (~> 4.31)
88+
sass-embedded (1.89.2-x86_64-darwin)
89+
google-protobuf (~> 4.31)
90+
sass-embedded (1.89.2-x86_64-linux-gnu)
91+
google-protobuf (~> 4.31)
6592
terminal-table (3.0.2)
6693
unicode-display_width (>= 1.1.1, < 3)
67-
unicode-display_width (2.3.0)
68-
webrick (1.8.2)
94+
unicode-display_width (2.6.0)
95+
webrick (1.9.1)
6996

7097
PLATFORMS
7198
arm64-darwin-21

community/BluemapLazyServer.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ that allows for 24/7 viewing of the map (and map markers), even when the server
1919
1. TOC
2020
{:toc}
2121

22-
2322
## Setting up a lazy server
2423

2524
The [lazymc] project can be used to set up a lazy Minecraft server. Essentially it acts just enough
@@ -30,8 +29,7 @@ Once the server is running, it monitors the number of current players and shuts
3029
empty. It can also be configured to pause the Minecraft server instead of shutting it down so it can
3130
be instantly resumed when the next player connects.
3231

33-
Detailed instructions on how to set up and configure lazymc are available in the project's README.
34-
32+
Detailed instructions on how to set up and configure lazymc are available in the project's [README](https://github.com/timvisee/lazymc?tab=readme-ov-file#lazymc).
3533

3634
## Configuring BlueMap
3735

@@ -66,7 +64,6 @@ to be configured with a short `proxy_read_timeout` to avoid hanging while waitin
6664
from the integrated webserver. This is because the paused server will accept the connection but not
6765
be able to respond in any way to the request.
6866

69-
7067
## Faking "live" data while server is offline
7168

7269
The frontend attempts to load live data (markers, players) from endpoints under
@@ -77,7 +74,6 @@ When shutting down (and periodically) BlueMap will write out the current live st
7774
looking for so we can just service the request normally from the webroot (falling back to a 204 No
7875
Content response if the requested file doesn't exist).
7976

80-
8177
## Example Nginx config
8278

8379
```nginx
@@ -170,7 +166,6 @@ yourdomain.com {
170166
> **will** need to adapt it to your setup!
171167
{: .info .important }
172168

173-
174169
[lazymc]:https://github.com/timvisee/lazymc
175170
[Nginx]: https://nginx.org/
176171
[Caddy]: https://caddyserver.com/

community/CaveRendering.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ literally just holes in some dark corners.
6060

6161
## Anti-cheating purposes
6262

63-
Please note that simply disabling free-flight won't be enough of an anti-cheat.
64-
You will need to mingle with the cave settings.
65-
Using a no-ore texture pack is also a great addition but as caves often contain ores,
66-
you will want to hide them as well.
63+
Please note that simply disabling free-flight won't be enough of an anti-cheat.
64+
You will need to mingle with the cave settings.
65+
Using a no-ore texture pack is also a great addition but as caves often contain ores, you will want to hide them as well.

community/Chat.md

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,38 @@ BlueMap Discord for free.
2525

2626
Requirement keywords as per [RFC 2119](https://datatracker.ietf.org/doc/html/rfc2119)
2727

28-
- You MUST have a Spigot based server. Paper SHOULD be used. The addon doesn't support other platforms.
29-
- You MUST have root access and be able to install and configure additional software such as nginx.
30-
- You MUST NOT run a server network with Bungeecord, Velocity or similar. The addon only supports one global chat.
31-
- You SHOULD have a public IP address. If you don't you will need to figure out exposing ports to the internet yourself.
32-
- You SHOULD know the basics of navigating around the command line, otherwise this will be painful.
33-
- You SHOULD have a domain. Have fun figuring out self signed certificates without a domain.
34-
- You SHOULD NOT run any chat plugins. The addon does not support them and the behaviour is undefined.
35-
- You MAY grab a sysadmin friend to help you.
28+
- You **MUST** have a Spigot based server. Paper **SHOULD** be used. The addon doesn't support other platforms.
29+
- You **MUST** have root access and be able to install and configure additional software such as nginx.
30+
- You **MUST NOT** run a server network with Bungeecord, Velocity or similar. The addon only supports one global chat.
31+
- You **SHOULD** have a public IP address. If you don't you will need to figure out exposing ports to the internet yourself.
32+
- You **SHOULD** know the basics of navigating around the command line, otherwise this will be painful.
33+
- You **SHOULD** have a domain. Have fun figuring out self signed certificates without a domain.
34+
- You **SHOULD NOT** run any chat plugins. The addon does not support them and the behaviour is undefined.
35+
- You **MAY** grab a sysadmin friend to help you.
3636

3737
The guide assumes all the recommendations are followed.
3838

3939
## The starting situation
4040

41-
We've got a VPS running Debian. The VPS has a public IP. There is a Paper Minecraft server running on port 25565 and
42-
BlueMap installed as a plugin running on port 8100. The BlueMap is accesible at `http://12.34.56.789:8100/`.
41+
We've got a VPS running Debian. The VPS has a public IP. There is a Paper Minecraft server running on port `25565` and
42+
BlueMap installed as a plugin running on port `8100`. The BlueMap is accesible at `http://12.34.56.789:8100/`.
4343
In my case the Minecraft server is run with a Docker container as seen below.
4444

4545
![Contents of compose.yml and files in the data directory]({{site.baseurl}}/assets/chat/starting-situation.png)
4646
![BlueMap already working at http://12.34.56.789:8100/]({{site.baseurl}}/assets/chat/bluemap-already-working.png)
4747

4848
## Proxying with nginx
4949

50-
Our first step is to put the BlueMap site behind nginx reverse proxy. This is needed as we want HTTPS,
51-
nginx auth request module and combine many services under one host. Install nginx using `sudo apt install -y nginx`.
52-
You should now be able to observe nginx working at `http://12.34.56.789/`
50+
Our first step is to put the BlueMap site behind NGINX reverse proxy.
51+
This is needed as we want HTTPS, NGINX auth request module and combine many services under one host.
52+
Install NGINX using `sudo apt install -y nginx`.
53+
You should now be able to observe NGINX working at `http://12.34.56.789/`
5354

5455
![Welcome to nginx!]({{site.baseurl}}/assets/chat/nginx-installed.png)
5556

56-
Next we should navigate to `/etc/nginx` to start configuring our fresh installation. We shall start by removing the
57-
default configuration files with `sudo rm -rf ./sites-available/default ./sites-enabled/default /var/www/html`.
58-
And creating our own using `sudo nano ./sites-available/bluemap.conf` with the following content.
57+
Next we should navigate to `/etc/nginx` to start configuring our fresh installation
58+
We shall start by removing the default configuration files with `sudo rm -rf ./sites-available/default ./sites-enabled/default /var/www/html`
59+
Then create our own using `sudo nano ./sites-available/bluemap.conf` with the following content:
5960

6061
```nginx
6162
server {
@@ -68,35 +69,35 @@ server {
6869
}
6970
```
7071

71-
Next we have to enable the create configuration file with `sudo ln -s ../sites-available/bluemap.conf ./sites-enabled/bluemap.conf`.
72-
Then after reloading nginx with `sudo nginx -s reload` we should see our BlueMap at the location which had nginx welcome page earlier.
72+
Next we have to enable the create configuration file with `sudo ln -s ../sites-available/bluemap.conf ./sites-enabled/bluemap.conf`.
73+
Then after reloading NGINX with `sudo nginx -s reload` we should see our BlueMap at the location which had NGINX welcome page earlier.
7374

7475
![BlueMap running through nginx proxy]({{site.baseurl}}/assets/chat/http-proxied-bluemap.png)
7576

76-
As we no longer use BlueMap's own port for accessing it. We should prevent it from being exposed. In our `compose.yml` file
77-
we can do `"127.0.0.1:8100:8100/tcp"` instead of `"8100:8100/tcp"`. If you don't use Docker, instead of changing Docker's
78-
port bindings change directly the ip address BlueMap uses by editing `plugins/BlueMap/webserver.conf` and adding `ip: "127.0.0.1"`.
77+
As we no longer use BlueMap's own port for accessing it. We should prevent it from being exposed.
78+
In our `compose.yml` file we can do `"127.0.0.1:8100:8100/tcp"` instead of `"8100:8100/tcp"`.
79+
If you don't use Docker, instead of changing Docker's port bindings, change the IP address BlueMap uses by editing `plugins/BlueMap/webserver.conf` and adding `ip: "127.0.0.1"`.
7980

8081
## Domain and HTTPS
8182

82-
Proxying is cool and all but it's pretty much a no-op right now. So open up your DNS management interface,
83-
in my case Cloudflare, and add an A record for the ip address of the server.
83+
Proxying is cool and all but it's pretty much a no-op right now.
84+
So open up your DNS management interface, in my case Cloudflare, and add an A record for the IP address of the server.
8485

8586
![DNS record at Cloudflare]({{site.baseurl}}/assets/chat/dns-cloudflare.png)
8687

87-
Change the server name in nginx `sites-available/bluemap.conf` file to match your chosen domain like this `server_name your.domain;`
88+
Change the server name in NGINX `sites-available/bluemap.conf` file to match your chosen domain like this `server_name your.domain;`
8889
The BlueMap should be accesible at the domain, just without HTTPS still.
8990

9091
To get the most out of our domain we want to use free SSL certificates to secure the connection. And to do that we need
9192
a tool to acquire certificates, like `acme.sh`, which is really cool. To install `acme.sh` we want to change to root user
9293
with `sudo su` and run `curl https://get.acme.sh | sh -s [email protected]` with your email.
9394

94-
Close and reopen your terminal and change back to root with `sudo su`, so we are now ready to get some free goodies.
95-
Run `acme.sh --issue --nginx -d your.domain` to acquire the certificates for your domain.
95+
Close and reopen your terminal and change back to root with `sudo su`, so we are now ready to get some free goodies.
96+
Run `acme.sh --issue --nginx -d your.domain` to acquire the certificates for your domain.
9697
Though these certificates are not ready for use yet.
9798

98-
First we want to prepare a couple of files and permissions so everything goes smoothly with nginx.
99-
Run the following commmands.
99+
First we want to prepare a couple of files and permissions so everything goes smoothly with NGINX.
100+
Run the following commmands:
100101

101102
```sh
102103
addgroup certs
@@ -110,8 +111,8 @@ chmod 770 /etc/nginx/certs
110111
chmod 660 /etc/nginx/certs/*
111112
```
112113

113-
These will setup a `certs` groups and a `certs` folder which only the users in the group (root and nginx) are allowed to access.
114-
Now we can install the certificates we acquired earlier.
114+
These will setup a `certs` groups and a `certs` folder which only the users in the group (root and NGINX) are allowed to access.
115+
Now we can install the certificates we acquired earlier:
115116

116117
```sh
117118
acme.sh --install-cert -d your.domain \
@@ -121,7 +122,7 @@ acme.sh --install-cert -d your.domain \
121122
```
122123

123124
We can now logout of the root user and get back to our normal user (unless you just do everything on root anyway...).
124-
Let's revise the nginx `sites-available/bluemap.conf` to use them.
125+
Let's revise the NGINX `sites-available/bluemap.conf` to use them.
125126

126127
```nginx
127128
server {
@@ -145,7 +146,7 @@ server {
145146
}
146147
```
147148

148-
After reloading nginx with `sudo nginx -s reload` we should have a working BlueMap website with HTTPS. Hurray!
149+
After reloading NGINX with `sudo nginx -s reload` we should have a working BlueMap website with HTTPS. Hurray!
149150

150151
![BlueMap with HTTPS]({{site.baseurl}}/assets/chat/bluemap-with-https.png)
151152

@@ -266,16 +267,16 @@ Your BlueMap should now have a log in button in the menu.
266267

267268
## Chat
268269

269-
We've finally arrived at the last step. Just one more plugin and a tiny bit of nginx configuration.
270+
We've finally arrived at the last step. Just one more plugin and a tiny bit of NGINX configuration.
270271

271272
Download [BlueMap-Chat](https://github.com/Chicken/Auth/releases/tag/bluemap-chat-v0.3.0), transfer it
272-
`scp ~/Downloads/BlueMap-Chat*.jar 12.34.56.789:~/minecraft-server/data/plugins` and restart the server.
273-
Yet again the version above is the one used during writing (v0.3.0). You may want to use a newer version
274-
but the instructions may differ, so refer to the official documentation.
275-
We Docker users have to fiddle with the ips and ports again. Edit the `plugins/BlueMap-Chat/config.yml` to have
273+
`scp ~/Downloads/BlueMap-Chat*.jar 12.34.56.789:~/minecraft-server/data/plugins` and restart the server.
274+
Yet again, the version above is the one used during writing (v0.3.0). You may want to use a newer version
275+
but the instructions may differ, so refer to the official documentation.
276+
We Docker users have to fiddle with the IP's and ports again. Edit the `plugins/BlueMap-Chat/config.yml` to have
276277
`ip: "0.0.0.0"` and `compose.yml` ports section to have `"127.0.0.1:8800:8800/tcp"`.
277278

278-
Next, in the nginx config, add the following above the "Other addons go here" text at the bottom of the file and reload nginx.
279+
Next, in the NGINX config, add the following above the "Other addons go here" text at the bottom of the file and reload NGINX.
279280

280281
```nginx
281282
# Chat addon

0 commit comments

Comments
 (0)