From 04688487baae276684e0128acb73089aba37a0c9 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Mon, 5 Dec 2022 23:08:50 +0100 Subject: [PATCH] setting funnel option for api --- flake.lock | 60 ++++++++++++++++---------------- modules/data-hoarder/socket.nix | 1 + modules/data-hoarder/website.nix | 2 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 5873687..d1b57cd 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ "windshield": "windshield" }, "locked": { - "lastModified": 1669581364, - "narHash": "sha256-U/a+R3XVzb2w501yYlGZHgqM2XIQes2slTQ13qjTbI0=", + "lastModified": 1670277338, + "narHash": "sha256-JGa2W1DwUCmn23VEdFvJHnKBn4p0UrzpKEAQit5xblg=", "owner": "dump-dvb", "repo": "dump-dvb.nix", - "rev": "70a52abcbc197d8d4346bcd366634ba03386aed4", + "rev": "2ce789429b60da9bd9a4d355c683dac7461cbc8f", "type": "github" }, "original": { @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1669580902, - "narHash": "sha256-qnkJeI5FZ8B3LKPkRhEz2s6tbaTS4TcHM0E2VaUa+Us=", + "lastModified": 1669668329, + "narHash": "sha256-d/PkmW8YCg7GLF/Q/M5orksJyVfry6E/PmCq25UV4/s=", "owner": "dump-dvb", "repo": "dump-dvb.rs", - "rev": "5567be58b8982b5a06c5995c70e58a2c0df35b4b", + "rev": "b9eff8854baef32a8c4d18857f7a9645a7efff20", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "dump-dvb-rust": { "flake": false, "locked": { - "lastModified": 1665951258, - "narHash": "sha256-t0aUYq4jiLiAcyDCJrI9UitydM3TLG/inupuM92n2GI=", + "lastModified": 1669580902, + "narHash": "sha256-qnkJeI5FZ8B3LKPkRhEz2s6tbaTS4TcHM0E2VaUa+Us=", "owner": "dump-dvb", "repo": "dump-dvb.rs", - "rev": "6fbb6bdcab4441cdee853e8e8c484606f8cf0dfc", + "rev": "5567be58b8982b5a06c5995c70e58a2c0df35b4b", "type": "github" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1668847457, - "narHash": "sha256-haU4EeGsg7vgtiSkBI8GHPNU866yLsoV53QvJfDajJI=", + "lastModified": 1670019402, + "narHash": "sha256-ZXJAn+vsDTROK/in61jgJo0mcpd6Vt5gTogOxu7JICE=", "owner": "dump-dvb", "repo": "funnel", - "rev": "3c36beec8e48217b378a9fd86098cde15a547d08", + "rev": "92d256d40d02e7a39f29ea4050bfe8d9d939340b", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1669306943, - "narHash": "sha256-F6xVWFJkcCXp5IcnpRlECT10H2ps8RO1yM4W0OXiXPs=", + "lastModified": 1669921518, + "narHash": "sha256-OWSXXmVzceV6Ild0nVEJjMsP9doCK+F4og30Mareaog=", "owner": "astro", "repo": "microvm.nix", - "rev": "c21a70fe1ac05ccdfceff6506625e9d44cd91da5", + "rev": "e2a1bf59987544faec4d27ce5700e5ef96201a5f", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669465383, - "narHash": "sha256-fVbG427suESAEb8/P47O/zD/G9BSeFxLh94IUzgOchs=", + "lastModified": 1670104339, + "narHash": "sha256-212aAMSy5uxzrUbHmvUm3oHh8c02wXJ7lyNjDa5NSAM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "899e7caf59d1954882a8e2dff45ccc0387c186f6", + "rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a", "type": "github" }, "original": { @@ -350,18 +350,18 @@ "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-stable": { "locked": { - "lastModified": 1669513802, - "narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=", + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6649e08812f579581bfb4cada3ba01e30485c891", + "rev": "86370507cb20c905800527539fc049a2bf09c667", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -438,14 +438,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669520266, - "narHash": "sha256-NY0lyWC5djlvAiAhGb9xvT0bknBVLh/egvd3TqmJasc=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a01f386f34a854fe4f8754e62a6837748bc84a8a", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1665678384, - "narHash": "sha256-B12DUEFUYszCc8hqRx+LGasaEUZw+KtWRFm/95+10BM=", + "lastModified": 1669984314, + "narHash": "sha256-BolYmN+dSGcFWSBs2CDCcMyFaMgKUrPsbZwP0Reqw6M=", "owner": "dump-dvb", "repo": "trekkie", - "rev": "841569d94b8883bf9023dded6c664d4826495980", + "rev": "4f51485674d6e13e0e68df15c372e5a87774dcb8", "type": "github" }, "original": { diff --git a/modules/data-hoarder/socket.nix b/modules/data-hoarder/socket.nix index 1520857..20daee1 100644 --- a/modules/data-hoarder/socket.nix +++ b/modules/data-hoarder/socket.nix @@ -14,6 +14,7 @@ in port = 9000 + serice_number; }; metrics.port = 9010; + apiAddress = "127.0.0.1:${toString config.dump-dvb.api.port}"; }; services = { nginx = { diff --git a/modules/data-hoarder/website.nix b/modules/data-hoarder/website.nix index bc83189..13add80 100644 --- a/modules/data-hoarder/website.nix +++ b/modules/data-hoarder/website.nix @@ -8,7 +8,7 @@ locations = { "/" = { extraConfig = '' - return 307 https://docs.dvb.solutions; + return 307 https://map.dvb.solutions; ''; }; };