gluttony: use webRoot variable

This commit is contained in:
Vegard Bieker Matthey
2026-05-24 08:33:24 +02:00
parent c67e381065
commit b8ec6308bd

View File

@@ -1,7 +1,6 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
let let
vanillaSurvival = "/var/lib/bluemap/vanilla_survival_world"; vanillaSurvival = "/var/lib/bluemap/vanilla_survival_world";
webExport = "/var/lib/bluemap/web";
format = pkgs.formats.hocon { }; format = pkgs.formats.hocon { };
in { in {
# NOTE: our version of the module gets added in flake.nix # NOTE: our version of the module gets added in flake.nix
@@ -105,7 +104,7 @@ in {
no-group = true; no-group = true;
rsh = "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=%d/ssh-known-hosts -i %d/sshkey"; rsh = "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=%d/ssh-known-hosts -i %d/sshkey";
}; };
in "${lib.getExe pkgs.rsync} ${rsyncArgs} ${webExport} root@bekkalokk.pvv.ntnu.no:/"; in "${lib.getExe pkgs.rsync} ${rsyncArgs} ${config.services.bluemap.webRoot} root@bekkalokk.pvv.ntnu.no:/";
LoadCredential = [ LoadCredential = [
"sshkey:${config.sops.secrets."bluemap/ssh-key".path}" "sshkey:${config.sops.secrets."bluemap/ssh-key".path}"
"ssh-known-hosts:${config.sops.secrets."bluemap/ssh-known-hosts".path}" "ssh-known-hosts:${config.sops.secrets."bluemap/ssh-known-hosts".path}"