Drift/pvv-nixos-config
17
6
Fork 1
Code Issues Pull Requests 7 Actions Wiki Activity

Use gluttony to render bluemap and rsync to bekkalokk #137

Manually merged
vegardbm merged 0 commits from gluttony-bluemap into main 2026-05-25 03:45:13 +02:00
Conversation 8 Commits - Files Changed -
vegardbm commented 2026-05-24 08:00:29 +02:00
Owner
Copy Link
Copy Source
No description provided.
vegardbm commented 2026-05-24 08:07:03 +02:00
Author
Owner
Copy Link
Copy Source

closes Drift/issues#156

closes Drift/issues#156
oysteikt reviewed 2026-05-24 08:21:04 +02:00
hosts/bekkalokk/services/bluemap.nix Outdated
@@ -1,6 +1,7 @@
{ config, lib, pkgs, inputs, ... }:
oysteikt commented 2026-05-24 08:18:58 +02:00
Owner
Copy Link
Copy Source

I think bekkalokk will still be pulling and rendering the maps if we don't modify this somehow? With the current config, it seems like both gluttony and bekkalokk will render the maps, and then gluttony will override whatever bekkalokk rendered with rsync. Maybe it would be best to just remove the entire services.bluemap config here, and just use services.nginx to configure the hosting directly?

I think bekkalokk will still be pulling and rendering the maps if we don't modify this somehow? With the current config, it seems like both gluttony and bekkalokk will render the maps, and then gluttony will override whatever bekkalokk rendered with rsync. Maybe it would be best to just remove the entire `services.bluemap` config here, and just use `services.nginx` to configure the hosting directly?
vegardbm marked this conversation as resolved
hosts/bekkalokk/services/bluemap.nix Outdated
@@ -2,2 +1,4 @@
{ config, lib, pkgs, inputs, values, ... }:
let
vanillaSurvival = "/var/lib/bluemap/vanilla_survival_world";
webExport = "/var/lib/bluemap/web";
oysteikt commented 2026-05-24 08:16:11 +02:00
Owner
Copy Link
Copy Source

This might be better dynamically evaluated as webExport = config.services.bluemap.webRoot, or possibly just inlined

This might be better dynamically evaluated as `webExport = config.services.bluemap.webRoot`, or possibly just inlined
vegardbm marked this conversation as resolved
hosts/gluttony/services/bluemap.nix Outdated
@@ -0,0 +4,4 @@
webExport = "/var/lib/bluemap/web";
format = pkgs.formats.hocon { };
in {
# NOTE: our versino of the module gets added in flake.nix
oysteikt commented 2026-05-24 08:13:25 +02:00
Owner
Copy Link
Copy Source

This typo was probably here on bekkalokk as well, but might as well fix since we're editing the code anyway

This typo was probably here on bekkalokk as well, but might as well fix since we're editing the code anyway
vegardbm marked this conversation as resolved
hosts/gluttony/services/bluemap.nix Outdated
@@ -0,0 +113,4 @@
};
};
services.nginx.virtualHosts."minecraft.pvv.ntnu.no" = {
oysteikt commented 2026-05-24 08:11:39 +02:00
Owner
Copy Link
Copy Source

This probably shouldn't be here unless we also are planning to host the webdir on gluttony?

This probably shouldn't be here unless we also are planning to host the webdir on gluttony?
vegardbm marked this conversation as resolved
vegardbm force-pushed gluttony-bluemap from da81004373 to 8e4717f190 2026-05-24 08:28:23 +02:00 Compare
vegardbm force-pushed gluttony-bluemap from 8e4717f190 to 309bd0199d 2026-05-24 08:30:24 +02:00 Compare
oysteikt reviewed 2026-05-24 08:33:01 +02:00
hosts/gluttony/services/bluemap.nix
@@ -0,0 +112,4 @@
];
};
};
oysteikt commented 2026-05-24 08:33:01 +02:00
Owner
Copy Link
Copy Source

You should probably remove the firewall opening here as well, that is for HTTPS with nginx

You should probably remove the firewall opening here as well, that is for HTTPS with nginx
vegardbm marked this conversation as resolved
vegardbm force-pushed gluttony-bluemap from 2e40197aef to bae0e6d7d4 2026-05-24 08:37:48 +02:00 Compare
vegardbm force-pushed gluttony-bluemap from ff9d928c8b to 4aeab2c7b8 2026-05-24 08:49:23 +02:00 Compare
oysteikt reviewed 2026-05-24 08:52:51 +02:00
hosts/bekkalokk/services/bluemap.nix
@@ -80,4 +12,1 @@
};
};
systemd.services."render-bluemap-maps" = {
oysteikt commented 2026-05-24 08:52:51 +02:00
Owner
Copy Link
Copy Source

This should probably be removed as well

This should probably be removed as well
vegardbm commented 2026-05-24 08:53:24 +02:00
Author
Owner
Copy Link
Copy Source

lol yes

lol yes
vegardbm marked this conversation as resolved
oysteikt reviewed 2026-05-24 08:53:15 +02:00
hosts/bekkalokk/services/bluemap.nix
@@ -7,3 +6,4 @@
# NOTE: our version of the module gets added in flake.nix
disabledModules = [ "services/web-apps/bluemap.nix" ];
sops.secrets."bluemap/ssh-key" = { };
oysteikt commented 2026-05-24 08:53:15 +02:00
Owner
Copy Link
Copy Source

These are seemingly not needed anymore? Can maybe be removed from the sops file as well

These are seemingly not needed anymore? Can maybe be removed from the sops file as well
vegardbm marked this conversation as resolved
oysteikt reviewed 2026-05-24 08:54:24 +02:00
hosts/bekkalokk/services/bluemap.nix
@@ -28,5 +28,5 @@
sorting = 0;
start-pos = {
x = 0;
z = 0;
};
oysteikt commented 2026-05-24 08:54:24 +02:00
Owner
Copy Link
Copy Source

This one is going to need some of the location config from the module, see

pvv-nixos-config/modules/bluemap.nix Lines 406 to 416 in 16d3251ee2
services.nginx.virtualHosts = lib.mkIf cfg.enableNginx {
"${cfg.host}" = {
root = config.services.bluemap.webRoot;
locations = {
"~* ^/maps/[^/]*/tiles/".extraConfig = ''
error_page 404 = @empty;
'';
"@empty".return = "204";
};
};
};

This one is going to need some of the `location` config from the module, see https://git.pvv.ntnu.no/Drift/pvv-nixos-config/src/commit/16d3251ee2df513bafacce4ecb7d782023831028/modules/bluemap.nix#L406-L416
vegardbm commented 2026-05-24 09:08:50 +02:00
Author
Owner
Copy Link
Copy Source

I don't get what you were trying to say here. What was wrong?

I don't get what you were trying to say here. What was wrong?
vegardbm marked this conversation as resolved
vegardbm force-pushed gluttony-bluemap from 4aeab2c7b8 to 52e1d693cc 2026-05-24 09:01:58 +02:00 Compare
oysteikt reviewed 2026-05-24 09:25:12 +02:00
flake.nix
@@ -188,5 +188,5 @@
overlays = [
(final: prev: {
mediawiki-extensions = final.callPackage ./packages/mediawiki-extensions {};
simplesamlphp = final.callPackage ./packages/simplesamlphp {};
bluemap = final.callPackage ./packages/bluemap.nix {};
oysteikt commented 2026-05-24 09:25:12 +02:00
Owner
Copy Link
Copy Source

Both this and the self.nixosModules.bluemap further down is probably not needed anymore.

Both this and the `self.nixosModules.bluemap` further down is probably not needed anymore.
vegardbm marked this conversation as resolved
vegardbm force-pushed gluttony-bluemap from 0570091ced to 273110b304 2026-05-24 10:04:12 +02:00 Compare
vegardbm added 6 commits 2026-05-25 03:24:37 +02:00
gluttony: setup bluemap c59c00f3fc
bluemap: set group to nginx only if nginx is enabled 6a943dd7b0
add bekkalokk to known_hosts eb0eb6d93b
gluttony: export rendered bluemap to bekkalokk b27859c0fa
bekkalokk: pull rendered map from gluttony 792f111a5d
gluttony: add private key and set public key for bekkalokk 57963fadd7
vegardbm force-pushed gluttony-bluemap from 79dd898f70 to 3d43a32fc7 2026-05-25 03:24:37 +02:00 Compare
oysteikt approved these changes 2026-05-25 03:25:29 +02:00
oysteikt left a comment
Owner
Copy Link
Copy Source

🔥🔥🔥

🔥🔥🔥
vegardbm added 2 commits 2026-05-25 03:29:02 +02:00
bekkalokk: remove bluemap 7a23cf7f25
bekkalokk: add back config added through bluemap module
Eval nix flake / evals (pull_request) Successful in 5m24s
Details
Eval nix flake / evals (push) Successful in 4m26s
Details
efd50868e0
vegardbm force-pushed gluttony-bluemap from 3d43a32fc7 to efd50868e0 2026-05-25 03:29:02 +02:00 Compare
vegardbm closed this pull request 2026-05-25 03:33:20 +02:00
vegardbm reopened this pull request 2026-05-25 03:39:06 +02:00
vegardbm closed this pull request 2026-05-25 03:40:49 +02:00
vegardbm reopened this pull request 2026-05-25 03:44:43 +02:00
vegardbm manually merged commit 0319858cad into main 2026-05-25 03:45:13 +02:00
vegardbm deleted branch gluttony-bluemap 2026-05-25 03:45:26 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
oysteikt
Labels
Clear labels
art
The issue needs someone to be creative
 backup
big
No, not bug, **big** - this is gonna take a while
 blocked
This issue/PR depends on one or more other issues/PRs
 bug
Something is not working, and it's not the shield hero
 comprehensive first issue
Do this as your first issue, and learn a lot of things
 crash report
Report an oopsie
 disputed
kranglefanter
 documentation
Documentation changes required
 duplicate
This issue or pull request already exists
 enhancement
New feature
 good first issue
Get your hands dirty with a new project here
 logging
networking
TTM4100
 nixos
Requires changes to our nixos setup
 question
More information is needed
 salt
Requires changes to our salt setup
 security
Skommel
 servers n' hardware
Regards hardware, servers or VMs
 simple first issue
Done in nix no time
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
adriangl (Adrian Gunnar Lauterer) albertba (Albert Bayazidi) alfhj (Alf Helge Jakobsen) amalieem (Amalie Erdal Mansaker) bjornoka (Bjornar Orjansen Kaarevik) chrisfjo (Christian Fredrik Johnsen) chrivi (Christoffer Viken) danio (Daniel Lovbrotte Olsen) davidk (David Kaasen) dungby (Dung-Bai Yen) eirikwit (Eirik Witterso) felixalb (Felix Albrigtsen) frero (Fredrik Robertsen) jonmro (Jon Martinus Rodtang) jovre (Jo Vassbotn Remvik) karolds (Karoline Dyve Samuelsen) knuta (Knut Auvor Grythe) krisleri (Kristoffer Longva Eriksen) larshhan (Lars Halvor Hansen) olived (Oliver Didriksen-Kolstad) oysteikt (Oystein Kristoffer Tveit) pederbs (Peder Bergebakken Sundt) root (rot) torsteno (Torstein Nordgård-Hansen) vegardbm (Vegard Bieker Matthey) yorinad (Yorin Anne De Jong)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Drift/pvv-nixos-config#137
Delete Branch "gluttony-bluemap"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?