diff --git a/flake.lock b/flake.lock index 8308918..638da64 100644 --- a/flake.lock +++ b/flake.lock @@ -117,6 +117,26 @@ "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git" } }, + "minecraft-heatmap": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756124334, + "narHash": "sha256-DXFmSpgI8FrqcdqY7wg5l/lpssWjslHq5ufvyp/5k4o=", + "ref": "refs/heads/main", + "rev": "83760b1ebcd9722ddf58a4117d29555da65538ad", + "revCount": 13, + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git" + }, + "original": { + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git" + } + }, "nix-gitea-themes": { "inputs": { "nixpkgs": [ @@ -211,6 +231,7 @@ "grzegorz-clients": "grzegorz-clients", "matrix-next": "matrix-next", "minecraft-data": "minecraft-data", + "minecraft-heatmap": "minecraft-heatmap", "nix-gitea-themes": "nix-gitea-themes", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index 98a9140..b5d1fee 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,9 @@ nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"; nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs"; + minecraft-heatmap.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git"; + minecraft-heatmap.inputs.nixpkgs.follows = "nixpkgs"; + greg-ng.url = "git+https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"; greg-ng.inputs.nixpkgs.follows = "nixpkgs"; gergle.url = "git+https://git.pvv.ntnu.no/Grzegorz/gergle.git"; @@ -104,11 +107,13 @@ modules = [ inputs.matrix-next.nixosModules.default inputs.pvv-calendar-bot.nixosModules.default + inputs.minecraft-heatmap.nixosModules.default self.nixosModules.gickup self.nixosModules.matrix-ooye ]; overlays = [ inputs.pvv-calendar-bot.overlays.x86_64-linux.default + inputs.minecraft-heatmap.overlays.default (final: prev: { inherit (self.packages.${prev.system}) out-of-your-element; }) diff --git a/hosts/bicep/configuration.nix b/hosts/bicep/configuration.nix index 30b143c..25caa13 100644 --- a/hosts/bicep/configuration.nix +++ b/hosts/bicep/configuration.nix @@ -9,6 +9,7 @@ ./services/calendar-bot.nix ./services/git-mirrors + ./services/minecraft-heatmap.nix ./services/mysql.nix ./services/postgres.nix diff --git a/hosts/bicep/services/minecraft-heatmap.nix b/hosts/bicep/services/minecraft-heatmap.nix new file mode 100644 index 0000000..95b9125 --- /dev/null +++ b/hosts/bicep/services/minecraft-heatmap.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.minecraft-heatmap; +in +{ + sops.secrets."minecraft-heatmap/ssh-key/private" = { + mode = "600"; + }; + + services.minecraft-heatmap = { + enable = true; + database = { + host = "postgres.pvv.ntnu.no"; + port = 5432; + name = "minecraft_heatmap"; + user = "minecraft_heatmap"; + passwordFile = pkgs.writeText "minecraft-heatmap-password.txt" "1234"; + }; + }; + + systemd.services.minecraft-heatmap-ingest-logs = { + serviceConfig.LoadCredential = [ + "sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}" + ]; + + preStart = let + knownHostsFile = pkgs.writeText "minecraft-heatmap-known-hosts" '' + innovation.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9O/y5uqcLKCodg2Q+XfZPH/AoUIyBlDhigImU+4+Kn + innovation.pvv.ntnu.no ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClR9GvWeVPZHudlnFXhGHUX5sGX9nscsOsotnlQ4uVuGsgvRifsVsuDULlAFXwoV1tYp4vnyXlsVtMddpLI5ANOIDcZ4fgDxpfSQmtHKssNpDcfMhFJbfRVyacipjA4osxTxvLox/yjtVt+URjTHUA1MWzEwc26KfiOvWO5tCBTan7doN/4KOyT05GwBxwzUAwUmoGTacIITck2Y9qp4+xFYqehbXqPdBb15hFyd38OCQhtU1hWV2Yi18+hJ4nyjc/g5pr6mW09ULlFghe/BaTUXrTisYC6bMcJZsTDwsvld9581KPvoNZOTQhZPTEQCZZ1h54fe0ZHuveVB3TIHovZyjoUuaf4uiFOjJVaKRB+Ig+Il6r7tMUn9CyHtus/Nd86E0TFBzoKxM0OFu88oaUlDtZVrUJL5En1lGoimajebb1JPxllFN5hqIT+gVyMY6nRzkcfS7ieny/U4rzXY2rfz98selftgh3LsBywwADv65i+mPw1A/1QdND1R6fV4U= + innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8= + ''; + in '' + mkdir -p '${cfg.minecraftLogsDir}' + "${lib.getExe pkgs.rsync}" \ + --archive \ + --verbose \ + --progress \ + --no-owner \ + --no-group \ + --rsh="${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=\"${knownHostsFile}\" -i \"$CREDENTIALS_DIRECTORY\"/sshkey" \ + root@innovation.pvv.ntnu.no:/ \ + '${cfg.minecraftLogsDir}'/ + ''; + }; +} diff --git a/secrets/bicep/bicep.yaml b/secrets/bicep/bicep.yaml index 82da3b2..fec2254 100644 --- a/secrets/bicep/bicep.yaml +++ b/secrets/bicep/bicep.yaml @@ -5,11 +5,11 @@ mysql: password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str] gickup: github-token: ENC[AES256_GCM,data:H/yBDLIvEXunmaUha3c2vUWKLRIbl9QrC0t13AQDRCTnrvhabeiUFLNxZ/F+4B6sZ2aPSgZoB69WwnHvh1wLdiFp1qLWKW/jQPvzZOxE4n+jXrnSOutUWktbPzVj,iv:KFW4jRru93JIl9doVFtcNkJDWp89NlzWjPDflHxcL/U=,tag:YtgyRxkoZO9MkuP3DJh7zA==,type:str] +minecraft-heatmap: + ssh-key: + private: ENC[AES256_GCM,data:h9OtD6hxrxyokFDe9bveAkMICrs3YrsAEqg0RVHV+xCkgkNAdoh85wb1QI8FJ0tga4Bfq8ZxZTdMnexQvbYWL8m/N/P6gWoPPJd7dwGuxaUZu5lqngVuHIhH0yWFWtPXjQ0Zyl5Q1aBKyjzJMvJc/H2iprgVH4YFs/fWf/KDEp17Plvvz0AoPGPrOZErDmne4MtLbW3pUm1r5ACo/41OyXYwjHk1Ywgsoz1CMxe/DrmkADnf7jSDWL6Q0mz8hIIYi8GbToJS4BIJ2plttraxV9sqpIPzS/1jMERNchItlkCppSYIy/eohVmskP8dAySm5Z7HNGGtzWSSGLxq15xKc7OVFYPMI+B35nPnp1LVOUWqBHAqVo7dwxc3VXOlVat7AMknUZnr67d4TIIl5BOdy/rvAxzXS/fDV0zntIs5o3phKStVvq07eZFaOVva45B7Pyyn0PdBhHBt2JcBtm+Xtg9i3xvZdwQgbeeJRhnYgDqK6BVhmtTuirwp1GOyslqaFCjg0MJj+W+d8R9gbbfyFR6YrZQAkcd/o/yZGg86z7Phe18=,iv:nt/+qPBwPZKQt43VJ9FbKjLYioFwCxD7VK9WNCJCmpQ=,tag:MuDfnTiro3VVJq9x5rkEQg==,type:str] + public: ENC[AES256_GCM,data:+fiCO8VRSmV7tmyweYSpZJMOuMORLHkWetYbr20aTQ1vRYr927nYGes4E464t+Dv9OyJPCLmHBdgt7UvxJWuC3pZE8iStnBYnej3D4ebMzi2SMfOkJjGuQSplXtl8QeAYe1YvROmtQ==,iv:thgGQUyWdXfwUt1E/vudoNjl8JjnksFd1rb/asTry+g=,tag:t1iQPocvfI+JafuJycaLuw==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2 enc: | @@ -65,8 +65,8 @@ sops: cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX 0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-07T21:34:48Z" - mac: ENC[AES256_GCM,data:n6GHD+nQmZL17WvUZiMCBLRHbtpoKU6U8o/Oraj0VSRi/pQ74QWGVEcIX87kFjBvR2C+UPd3KwXzjQHhjUfHpz9EjIGi6tXLTTo8K3ptd2wCL8MW418TVO4KV+BFmHGT4kwlbdoqaJ2SA7HcfXNaC68e/2CTXhtkLpIwGXtYWJA=,iv:iC5QX/JMwno4mBljPdorNmcQSD2wy/wOYvGrUoC2yzg=,tag:GuFNQ6+d6o9DYC6Do/IEqQ==,type:str] + lastmodified: "2025-08-22T17:54:32Z" + mac: ENC[AES256_GCM,data:lUcE2bwdgDAAEZWSe9At8Rx5ieixboxJNw7xkXfBRo4OgnU/zp6660lwc7Q9uVQBKZxmdx9BJsGeoWh6eehbTxfJYNhUbAJB/7hnkD2HTiBR/0nJAL9iixlXxehn85QhWZ3KXWQDU9l26X4saYIF3rWvGXlM8oSkoPsPluxGfG4=,iv:0m7LpwOort5mKB0jzd4qnwOACuj/aE+8AoXSuv6Nx/s=,tag:LqxCKFYq+flQ/b361ZZSqw==,type:str] pgp: - created_at: "2024-08-04T00:03:40Z" enc: |- @@ -89,4 +89,4 @@ sops: -----END PGP MESSAGE----- fp: F7D37890228A907440E1FD4846B9228E814A2AAC unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.10.2