dump-dvb/nix-config
dump-dvb
/
nix-config
mirror of https://github.com/dump-dvb/nix-config.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

removing useless overwrites

This commit is contained in:
Tassilo - 2023-04-12 17:52:45 +02:00
parent 505cb3ca93
commit a601b09860
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
7 changed files with 234 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
flake.lock
View File

@ -1,11 +1,35 @@
{
"nodes": {
"chemo": {
"bureaucrat": {
"inputs": {
"crane": "crane",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1681312169,
"narHash": "sha256-B5Uc4y0ysuvsHt27v63SciVnvl46dSmTELIbUqKLEKo=",
"owner": "tlm-solutions",
"repo": "bureaucrat",
"rev": "78779278186fbda7b649d2365ac4e4dd5d54daf7",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "bureaucrat",
"type": "github"
}
},
"chemo": {
"inputs": {
"crane": "crane_2",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
@ -25,6 +49,33 @@
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"bureaucrat",
"utils"
],
"nixpkgs": [
"bureaucrat",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1680584903,
"narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": [
"chemo",
"utils"
@ -33,7 +84,7 @@
"chemo",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1679269454,
@ -49,6 +100,33 @@
"type": "github"
}
},
"crane_3": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": [
"lizard",
"utils"
],
"nixpkgs": [
"lizard",
"nixpkgs"
],
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1681177078,
"narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
"owner": "ipetkov",
"repo": "crane",
"rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"data-accumulator": {
"inputs": {
"naersk": [
@ -136,16 +214,48 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681037374,
"narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -166,11 +276,11 @@
]
},
"locked": {
"lastModified": 1681072573,
"narHash": "sha256-jF1wVuwuaQhfn4kBdePui8vlwRJ69ZGfWo9oIgelB7c=",
"lastModified": 1681312528,
"narHash": "sha256-VqnuJBhElqTXVXtAhXGqv6DQISYgcnnqDlgX859YF9g=",
"owner": "tlm-solutions",
"repo": "funnel",
"rev": "8e7efe9b8f64db767f2dd9e3ae307615985a6a06",
"rev": "aea33049e85be0e8a28f97e58038e350c3493f78",
"type": "github"
},
"original": {
@ -241,6 +351,30 @@
"type": "github"
}
},
"lizard": {
"inputs": {
"crane": "crane_3",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1681312638,
"narHash": "sha256-y98nEHKrHr0LooSxW0H1pulfkUuLZpHtJFVdvxXvWXU=",
"owner": "tlm-solutions",
"repo": "lizard",
"rev": "25cc025941e1152ad9eedccd2f7cd8ed9c51a626",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "lizard",
"type": "github"
}
},
"microvm": {
"inputs": {
"flake-utils": [
@ -251,11 +385,11 @@
]
},
"locked": {
"lastModified": 1681063606,
"narHash": "sha256-aqjkztq9OjyTXuaYD1L5AC/az3/rv8dO1y0o7tkqX6E=",
"lastModified": 1681167553,
"narHash": "sha256-R2du5E3oLeBvAY2Z4LT4PWha8x+6h38EBezVDTUnELs=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "b496028321ba11ca3e6eef286ca3915577f4b793",
"rev": "2e81186da4d4f6daaaca2d7e3319aeeded7b72d8",
"type": "github"
},
"original": {
@ -286,11 +420,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1681041438,
"narHash": "sha256-NmRGMklxBZ8Ol47CKMQxAU1F+v8ySpsHAAiC7ZL4vxY=",
"lastModified": 1681154110,
"narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "48dcbaf7fa799509cbec85d55b8d62dcf1477d57",
"rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247",
"type": "github"
},
"original": {
@ -334,6 +468,7 @@
},
"root": {
"inputs": {
"bureaucrat": "bureaucrat",
"chemo": "chemo",
"data-accumulator": "data-accumulator",
"datacare": "datacare",
@ -342,11 +477,11 @@
"funnel": "funnel",
"gnuradio-decoder": "gnuradio-decoder",
"kindergarten": "kindergarten",
"lizard": "lizard",
"microvm": "microvm",
"naersk": "naersk",
"nixpkgs": "nixpkgs",
"sops-nix": "sops-nix",
"state-api": "state-api",
"telegram-decoder": "telegram-decoder",
"tlms-rs": "tlms-rs",
"trekkie": "trekkie",
@ -355,6 +490,33 @@
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"bureaucrat",
"crane",
"flake-utils"
],
"nixpkgs": [
"bureaucrat",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1680488274,
"narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"chemo",
@ -381,6 +543,33 @@
"type": "github"
}
},
"rust-overlay_3": {
"inputs": {
"flake-utils": [
"lizard",
"crane",
"flake-utils"
],
"nixpkgs": [
"lizard",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1680488274,
"narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -389,11 +578,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1681008913,
"narHash": "sha256-6C4BknF+cwCnl/A2fFdlAnc3LMV7f7XqOL09UhLZ9tA=",
"lastModified": 1681209176,
"narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "ddc6f124cb9be22d2ba066064c28bc19039a6bce",
"rev": "00d5fd73756d424de5263b92235563bc06f2c6e1",
"type": "github"
},
"original": {
@ -402,32 +591,6 @@
"type": "github"
}
},
"state-api": {
"inputs": {
"naersk": [
"naersk"
],
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1678547620,
"narHash": "sha256-N2c/EdO/Zf1rM/3y6kpXLjca1vtVP2/NZsbPW4adLFA=",
"owner": "tlm-solutions",
"repo": "state-api",
"rev": "133f57a6a5d17f5e814255f68728f10f7d1fad06",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "state-api",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -476,11 +639,11 @@
]
},
"locked": {
"lastModified": 1680988831,
"narHash": "sha256-QxGJLHjEQF/jeYS9pQeSPETnfFxvaNqfzZcr70rNwCw=",
"lastModified": 1681162284,
"narHash": "sha256-1mrJH7rw0+ZUW0kCXcBNUuQ/zilWISRTYklne7JAcDI=",
"owner": "tlm-solutions",
"repo": "tlms.rs",
"rev": "d68ef117fa3d2a7ef3d5d87f60969a3acc843ed9",
"rev": "b538416be0be7cb42c4d22e83f717ca88ca838d4",
"type": "github"
},
"original": {
@ -492,11 +655,11 @@
"tlms-rust": {
"flake": false,
"locked": {
"lastModified": 1680988831,
"narHash": "sha256-QxGJLHjEQF/jeYS9pQeSPETnfFxvaNqfzZcr70rNwCw=",
"lastModified": 1681162284,
"narHash": "sha256-1mrJH7rw0+ZUW0kCXcBNUuQ/zilWISRTYklne7JAcDI=",
"owner": "tlm-solutions",
"repo": "tlms.rs",
"rev": "d68ef117fa3d2a7ef3d5d87f60969a3acc843ed9",
"rev": "b538416be0be7cb42c4d22e83f717ca88ca838d4",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -80,14 +80,12 @@
lizard = {
url = "github:tlm-solutions/lizard";
inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk";
inputs.utils.follows = "flake-utils";
};
bureaucrat = {
url = "github:tlm-solutions/bureaucrat";
inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk";
inputs.utils.follows = "flake-utils";
};

2
modules/data-hoarder/bureaucrat.nix
View File

@ -10,7 +10,7 @@ in
port = 50050 + service_number;
};
redis = {
http = config.services.redis.servers."state".bind;
host = config.services.redis.servers."state".bind;
port = config.services.redis.servers."state".port;
};
};

6
modules/data-hoarder/chemo.nix
View File

@ -13,9 +13,9 @@
};
GRPC = [
{
name = "API";
host = config.TLMS.api.GRPC.host;
port = config.TLMS.api.GRPC.port;
name = "BUREAUCRAT";
host = config.TLMS.bureaucrat.grpc.host;
port = config.TLMS.bureaucrat.grpc.port;
}
{
name = "FUNNEL";

17
modules/data-hoarder/grafana.nix
View File

@ -51,13 +51,24 @@
];
}
# metrics from state-api
# metrics from lizard
{
job_name = "state-api";
job_name = "lizard";
metrics_path = "/metrics";
static_configs = [
{
targets = [ "127.0.0.1:${toString config.TLMS.api.port}"];
targets = [ "${config.TLMS.lizard.http.host}:${toString config.TLMS.lizard.http.port}"];
}
];
}
# metrics from datacare
{
job_name = "datacare";
metrics_path = "/metrics";
static_configs = [
{
targets = [ "${config.TLMS.datacare.host}:${toString config.TLMS.datacare.port}"];
}
];
}

6
modules/data-hoarder/lizard.nix
View File

@ -11,7 +11,7 @@ in
};
redis = {
http = config.services.redis.servers."state".bind;
host = config.services.redis.servers."state".bind;
port = config.services.redis.servers."state".port;
};
@ -28,12 +28,12 @@ in
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"api.${config.deployment-TLMS.domain}" = {
"lizard.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.TLMS.api; "http://127.0.0.1:${toString port}/";
proxyPass = with config.TLMS.lizard.http; "http://${host}:${toString port}/";
proxyWebsockets = true;
};
};

1
modules/data-hoarder/socket.nix
View File

@ -17,7 +17,6 @@ in
port = 9010;
host = "0.0.0.0";
};
apiAddress = "127.0.0.1:${toString config.TLMS.api.port}";
};
services = {
nginx = {