Merge branch 'master' of github.com:pandorabox-io/pandorabox.io

data/nginx/routes/kv.conf

@@ -0,0 +1,9 @@
+location /kv/ {
+	proxy_pass http://kv:7379/;
+	proxy_buffering off;
+	proxy_http_version 1.1;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection $http_connection;
+	access_log off;
+}

data/prometheus.yml

@@ -1,5 +1,5 @@
 global:
-    scrape_interval: 5s
+    scrape_interval: 1s
     external_labels:
         monitor: 'my-monitor'
 scrape_configs:

doc/faq.md

@@ -0,0 +1,16 @@
+## FAQ
+
+Frequently asked questions
+
+### Can i contribute?
+* Of course, open an **issue** or submit a **PR** if you have an idea
+
+### Where can i help?
+* Take a look at the **issues** and pick one :smile:
+
+### Can i help with admin stuff?
+* Sure, but please provide some infos about you and your know-how first...
+
+### What happens with the map if the server closes someday
+* I intend to provide a public download when the day comes: #76
+* Alternatively, if you want to provide an offsite mirror please contact me ingame or with the webmail feature (player: "admin")

doc/services.md

@@ -0,0 +1,36 @@
+
+List of services used by the server
+
+### Website
+
+* URL: https://pandorabox.io
+* Repository: https://github.com/pandorabox-io/pandorabox-website
+* Tech-stack: html, javascript
+
+### Mods
+
+* Repositories: https://github.com/pandorabox-io
+* Tech-stack: lua
+
+### Mapserver
+
+* URL: https://pandorabox.io/map
+* Repository: https://github.com/minetest-tools/mapserver
+* Tech-stack: go, html, javascript, sql
+
+### Highscore
+
+* URL: https://pandorabox.io/highscore
+* Repository: https://git.rudin.io/minetest/xp-highscore
+* Tech-stack: nodejs, html, javascript, sql
+
+### Webmail
+
+* URL: https://pandorabox.io/webmail
+* New Repository: https://github.com/thomasrudin-mt/mail
+* Tech-stack: nodejs, html, javascript, lua
+
+### Portainer
+
+* Container management
+* https://portainer.io

docker-compose.yml

@@ -39,6 +39,15 @@ services:
 
  auth-proxy:
   image: registry.rudin.io/x86/mt-auth-proxy:latest
+  restart: always
+
+ beerchat-proxy:
+  image: registry.rudin.io/x86/beerchat_proxy:latest
+  restart: always
+  environment:
+   IRC_HOST: chat.freenode.net
+   IRC_CHANNEL: pandorabox
+   IRC_USERNAME: pandorabot
 
  mapserver:
   image: registry.rudin.io/x86/mapserver
@@ -132,14 +141,14 @@ services:
     max-size: 50m
 
  prometheus:
-  image: prom/prometheus:v2.6.1
+  image: prom/prometheus:v2.11.1
   volumes:
    - ./data/prometheus.yml:/etc/prometheus/prometheus.yml
    - ./data/prometheus:/prometheus
   depends_on:
    - "pushgateway"
   command:
-   - '--config.file=/etc/prometheus/prometheus.yml'
+   - '--config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time=2d'
   logging:
    options:
     max-size: 50m
@@ -158,6 +167,11 @@ services:
    options:
     max-size: 50m
 
+ kv:
+  image: anapsix/webdis
+  restart: always
+  environment:
+   - LOCAL_REDIS=true
 
 networks:
  terminator:

readme.md

@@ -5,57 +5,37 @@ Set up with `docker-compose`
 
 ## Links
 
-* [Mod-list](doc/mods.md)
-* [Settings](doc/settings.md)
+* [Mod-list](doc/mods.md) a rough mod-overview (manually maintained, may be out of date)
+* [Settings](doc/settings.md) `minetest.conf` extract
+* [Services](doc/services.md) List of (micro-)services used by the server
+* [FAQ](doc/faq.md) Frequently asked questions (code/server related)
 
+## Contributors
 
-## Overview
+Thanks to all the various contributors:
+(feel free to submit a PR or open an issue if i forgot you or you don't wanna be on here)
 
-### Website
+### Code
 
-* URL: https://pandorabox.io
-* Repository: https://github.com/pandorabox-io/pandorabox-website
-* Tech-stack: html, javascript
+* coil / @coil0
+* int / @int-ua
+* SX / @S-S-X
+* @6r1d
+* AceRichman / @OgelGames
 
-### Mods
+### Moderation / ingame assistance
 
-* Repositories: https://github.com/pandorabox-io
-* Tech-stack: lua
+* Adventurer
+* Ruggila
+* int
+* SwissalpS
 
-### Mapserver
+(/mail me if i forgot you, it happens...)
 
-* URL: https://pandorabox.io/map
-* Repository: https://github.com/thomasrudin-mt/mapserver
-* Tech-stack: go, html, javascript, sql
+### Building
 
-### Highscore
-
-* URL: https://pandorabox.io/highscore
-* Repository: https://git.rudin.io/minetest/xp-highscore
-* Tech-stack: nodejs, html, javascript, sql
-
-### Webmail
-
-* URL: https://pandorabox.io/webmail
-* New Repository: https://github.com/thomasrudin-mt/mail
-* Tech-stack: nodejs, html, javascript, lua
-
-### Portainer
-
-* Container management
-* https://portainer.io
-
-## FAQ
-
-### Can i contribute?
-* Of course, open an **issue** or submit a **PR** if you have an idea
-
-### Where can i help?
-* Take a look at the **issues** and pick one :smile:
-
-### Can i help with admin stuff?
-* Sure, but please provide some infos about you and your know-how first...
-
-### What happens with the map if the server closes someday
-* I intend to provide a public download when the day comes: #76
-* Alternatively, if you want to provide an offsite mirror please contact me ingame or with the webmail feature (player: "admin")
+* Warden (rework of my "boring" spawn platform)
+* Pixalou (Streets with light in new-town)
+* Ruggila (technic tutorial)
+* SX (digiline tutorial)
+* parasite / @parasitoid (mesecons tutorial)