From e007da718424b5588d4d1cf16518a265d8660212 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Wed, 14 Sep 2022 22:53:45 +0200 Subject: [PATCH] add nginx for data-accumulator --- flake.lock | 60 +++++++++++------------ modules/data-hoarder/data-accumulator.nix | 19 +++++++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index a559a9d..d37d253 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ] }, "locked": { - "lastModified": 1662676776, - "narHash": "sha256-l3cokTnNg85CKD02bNsNlMUeOG7/+DtDZ2MEv1rIOUE=", + "lastModified": 1662910390, + "narHash": "sha256-oXCFWuMe49NAqNW0om4CnLpj0BU04wSne9P2Hr7aUHI=", "owner": "dump-dvb", "repo": "click", - "rev": "98cb7330a35d5ee9879859f7f6240b01b6f444bf", + "rev": "895af7221183ace4df70bf61418e58f88b5c827b", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1662652396, - "narHash": "sha256-7Q0jj0Nj30dUlNUfhk/4bYg+hUbU+LA3mDaqMd9lq9E=", + "lastModified": 1662909766, + "narHash": "sha256-VmyXfecjpGX2yhPW7QvwvIATqYtVnvu5Jl663JW7rOc=", "owner": "dump-dvb", "repo": "clicky-bunty-server", - "rev": "8c102e73b04fda6f3bc94691399d8b1cfcd5530f", + "rev": "2be0cf4646ff7fdfdd7f853152a878a9a350e238", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "windshield": "windshield" }, "locked": { - "lastModified": 1662817637, - "narHash": "sha256-lrruA7Cc8e7q0amOQVmOOaXnsxamAtKyJVDx5g3I3O8=", + "lastModified": 1663188343, + "narHash": "sha256-CeE8Lbe60KfB5jgdv2/tJ5HF9DDcO1I/r+2zqLa5EBg=", "owner": "dump-dvb", "repo": "dump-dvb.nix", - "rev": "330934995a6208b4981db60935304b95dd97fbd1", + "rev": "4194ffe532aba415b0f47a6336b8f8b306f69cae", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1662761957, - "narHash": "sha256-rg4pyErMizk7gr+TyrDPABgLiAadWMJgL/U2l7vhn6s=", + "lastModified": 1662834288, + "narHash": "sha256-WhZ0VLEknhystfiZtdhpTl9v9d6jR0efpli37HUjIoE=", "owner": "dump-dvb", "repo": "dvb-api", - "rev": "99c52b03c1e195a24a5ced64e1ab6f6be6c4b4ef", + "rev": "36692b1d34e99bc94303f57f354a25d480b75bc7", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1662681039, - "narHash": "sha256-I/8mLhVbnCLLYR8a7mMtTxQZfeTNBTK/yDFpNXFtH90=", + "lastModified": 1663097512, + "narHash": "sha256-yv/ROVoiBPUW4Y4GbUJ5XJpT5jMBsDVo0QOsvgfBspU=", "owner": "astro", "repo": "microvm.nix", - "rev": "ae72a6f38247f1c226acae43568612c8b0bf7c03", + "rev": "b811add79b6a6eb6bbd21e6e1bd06477819ec807", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662099760, - "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", + "lastModified": 1663067291, + "narHash": "sha256-1BTrqhLMamWf53sJobtMiUDI91PEw6xF8YEwg2VE8w4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "67e45078141102f45eff1589a831aeaa3182b41e", + "rev": "d86a4619b7e80bddb6c01bc01a954f368c56d1df", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1662221733, - "narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=", + "lastModified": 1662864125, + "narHash": "sha256-AtjyEFK7Zp9+hOOUNO1/YZRADV/wC94R3yeKN8saUK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed", + "rev": "e6f053b6079c16e7df97531e3e0524ace1304d4d", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1662390490, - "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", + "lastModified": 1662870301, + "narHash": "sha256-O+ABD+WzEBLVH6FwxKCIpps0hsR6b5dpYe6fB3e3Ju8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", + "rev": "20929e1c5722a6db2f2dbe4cd36d4af0de0a9df0", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1662587866, - "narHash": "sha256-RGmh+zMli1rSD6uKlB4pm1WVPUupJ9f7foibrO0k1jY=", + "lastModified": 1663023066, + "narHash": "sha256-coo56nfKCpI3LcNJz7J/dWDvEBZATpd2xIbE9ZnkAig=", "owner": "dump-dvb", "repo": "stop-names", - "rev": "ae192f2705008587fce8a910583d9bf0cf39cd32", + "rev": "232ed7bc4b1f961d798627ebaf392e705877cbbf", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1662140439, - "narHash": "sha256-kaZ4FPCgzHUFN/FzNB81B5I7XxewyV0dkDm5wkveSPc=", + "lastModified": 1663019013, + "narHash": "sha256-Fo04ojkpMnyHk4fBn3D7dienNvFYpQ8yOyXnbBqzjXA=", "owner": "dump-dvb", "repo": "wartrammer-40k", - "rev": "c742caadb19c729d35e9f9a45e9d39462559714d", + "rev": "c715ee742a5a831dd80a40e4686102cd3cc0f44a", "type": "github" }, "original": { diff --git a/modules/data-hoarder/data-accumulator.nix b/modules/data-hoarder/data-accumulator.nix index b7f2186..35ede52 100644 --- a/modules/data-hoarder/data-accumulator.nix +++ b/modules/data-hoarder/data-accumulator.nix @@ -26,4 +26,23 @@ after = [ "postgresql.service" ]; wants = [ "postgresql.service" ]; }; + + services = { + nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts = { + "dump.${config.dump-dvb.domain}" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + proxyPass = with config.dump-dvb.dataAccumulator; "http://${host}:${toString port}/"; + }; + }; + }; + }; + }; + }; + }