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

REBRANDING. Shit is broken

This commit is contained in:
oxapentane - 2022-12-30 18:29:13 +01:00
parent 86cded905e
commit 76878887fe
Signed by: oxapentane
GPG Key ID: 91FA5E5BF9AA901C
44 changed files with 306 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
result
*.qcow2
tmp

398
flake.lock
View File

@ -1,26 +1,60 @@
{
"nodes": {
"TLMS": {
"inputs": {
"click": "click",
"data-accumulator": "data-accumulator",
"datacare": "datacare",
"dvb-api": "dvb-api",
"funnel": "funnel",
"gnuradio-decoder": "gnuradio-decoder",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
],
"stops": "stops",
"telegram-decoder": "telegram-decoder",
"tlms-rs": "tlms-rs",
"trekkie": "trekkie",
"utils": "utils_2",
"wartrammer": "wartrammer",
"windshield": "windshield"
},
"locked": {
"lastModified": 1672420816,
"narHash": "sha256-BEO2nrq/Zi0ZxevFt4CVrCj5R1LfkoC+aPM80lehKEY=",
"owner": "tlm-solutions",
"repo": "TLMS.nix",
"rev": "a24c94b0d77a32394e16300527f19dacecd9a606",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "TLMS.nix",
"type": "github"
}
},
"click": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1670369433,
"narHash": "sha256-8dnqgBTs11RKG1wPxLX9KGlgEA3TO9cv77kai1TjZe4=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "click",
"rev": "aef03393401e39d38afa5c9f316da150c9d32f42",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "click",
"type": "github"
}
@ -28,28 +62,28 @@
"data-accumulator": {
"inputs": {
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1671227082,
"narHash": "sha256-Hd51P4b0JkW5S4Qsqt/vumn5bPbwXM5XPXGk15+snZg=",
"owner": "dump-dvb",
"lastModified": 1672266234,
"narHash": "sha256-EYxLJWJBOglOCjSwYvDlsq38FjaGJRfGMLS8shxr1sU=",
"owner": "tlm-solutions",
"repo": "data-accumulator",
"rev": "c56795eb49f3194c938f2d1ff6d65ed03de79f51",
"rev": "9ef2e1073bc88d35672323958ccd00ed52808176",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "data-accumulator",
"type": "github"
}
@ -57,173 +91,73 @@
"datacare": {
"inputs": {
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1671752356,
"narHash": "sha256-ERdozxCjRZFREBCjBx7DEnTcZtxp1J1N65OR8EdEOgY=",
"owner": "dump-dvb",
"lastModified": 1671764363,
"narHash": "sha256-gQcZS0ZWqU2fdgQdVejik4P50L4kcKM7UOtlpOGAV8I=",
"owner": "tlm-solutions",
"repo": "datacare",
"rev": "9cd65246000b6de3fa83736c7f9c308eefd5b375",
"rev": "b06a8e23ad417c908de03b64b84c896d3cf36cf2",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "datacare",
"type": "github"
}
},
"decode-server": {
"inputs": {
"naersk": [
"dump-dvb",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"nixpkgs"
],
"utils": [
"dump-dvb",
"utils"
]
},
"locked": {
"lastModified": 1671229231,
"narHash": "sha256-wm7SxCWVNVt4QePTUOI9zUOwyy3xKaen7dAplWdTtw0=",
"owner": "dump-dvb",
"repo": "decode-server",
"rev": "9a68ed95825dcc147ebdac115ae15615af4d4c4f",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "decode-server",
"type": "github"
}
},
"documentation-src": {
"flake": false,
"locked": {
"lastModified": 1669248915,
"narHash": "sha256-+pJzcS8jraCdvXwbxjMCdVqK2kyXih+61gaCCPX+txg=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "documentation",
"rev": "c65ea26a7720e90fb54fc31fba5d0c048bd404be",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "documentation",
"type": "github"
}
},
"dump-dvb": {
"inputs": {
"click": "click",
"data-accumulator": "data-accumulator",
"datacare": "datacare",
"decode-server": "decode-server",
"dump-dvb-rs": "dump-dvb-rs",
"dvb-api": "dvb-api",
"funnel": "funnel",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
],
"radio-conf": "radio-conf",
"stops": "stops",
"trekkie": "trekkie",
"utils": "utils_2",
"wartrammer": "wartrammer",
"windshield": "windshield"
},
"locked": {
"lastModified": 1671753060,
"narHash": "sha256-U0xm5DVuEc9olOoH2TqtFxBfakp81X9iKiKSvHjXqiw=",
"owner": "dump-dvb",
"repo": "dump-dvb.nix",
"rev": "05d96871c917996ee5a6c73c4a4545a1580bd466",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "dump-dvb.nix",
"type": "github"
}
},
"dump-dvb-rs": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671743049,
"narHash": "sha256-Z1Mt7TfgEmhM4ph7NMYQ/q3IbJX2Z4QeVYx5GvGbSJo=",
"owner": "dump-dvb",
"repo": "dump-dvb.rs",
"rev": "f6cf7e3cd00d2f1994748a75241986fbc59f028c",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "dump-dvb.rs",
"type": "github"
}
},
"dump-dvb-rust": {
"flake": false,
"locked": {
"lastModified": 1670408159,
"narHash": "sha256-DKYCxY6rMYyLH/4ztx/H0vScUiQLgQq4Dr/WM03eSzw=",
"owner": "dump-dvb",
"repo": "dump-dvb.rs",
"rev": "cdf37215bff1614405516b13eb8c4e56219ea9da",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "dump-dvb.rs",
"type": "github"
}
},
"dvb-api": {
"inputs": {
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1670368765,
"narHash": "sha256-ZUH8slE8/h2M+sEcJaMbno6qFHcv6afjdhf+8RfN370=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "dvb-api",
"rev": "ce9925d5675c3ae372324694f73872df97c30a00",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "dvb-api",
"type": "github"
}
@ -231,7 +165,7 @@
"fenix": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"TLMS",
"stops",
"nixpkgs"
],
@ -268,39 +202,64 @@
},
"funnel": {
"inputs": {
"dump-dvb-rust": "dump-dvb-rust",
"json-structs": "json-structs",
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"tlms-rust": "tlms-rust",
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1671475854,
"narHash": "sha256-ZXhdb+dwIFkkgYzN7VJsBu3aCrfNIjYUePDTEfXl0Uk=",
"owner": "dump-dvb",
"lastModified": 1672329711,
"narHash": "sha256-I4Sx4iwrfp0T/Vg+wCSquNuE46Yt+Zd5xmrkV9a3KNM=",
"owner": "tlm-solutions",
"repo": "funnel",
"rev": "24ba4397dbca6cbb9d08a566a639c3203b838871",
"rev": "e49f2f4f1b9cdc3c887be0f35f2a45281b1c67c4",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "funnel",
"type": "github"
}
},
"gnuradio-decoder": {
"inputs": {
"nixpkgs": [
"TLMS",
"nixpkgs"
],
"utils": [
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1665616750,
"narHash": "sha256-LKkr9h805FuJ+wXUatQ+cz7Vt59S9I7gN/1yzwmraZE=",
"owner": "tlm-solutions",
"repo": "gnuradio-decoder",
"rev": "f6f42736cc1a1024c5da4cce69d56042499d81d3",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "gnuradio-decoder",
"type": "github"
}
},
"json-structs": {
"flake": false,
"locked": {
"lastModified": 1667607472,
"narHash": "sha256-lyeM+jkZRfclF7gCWj0ZGvuH5O/UAczPUd7rcVgh+T4=",
"lastModified": 1671005252,
"narHash": "sha256-U7rrOmDxigZFVxRQDj9g7S9WgLbrPeHZ+UKuZz+eGVU=",
"owner": "jorgen",
"repo": "json_struct",
"rev": "de80d452b3cc1688dfc2967dbfef5cb501e925d3",
"rev": "09a790818c47c9d748c2381d37b94a697a53d2cd",
"type": "github"
},
"original": {
@ -317,11 +276,11 @@
]
},
"locked": {
"lastModified": 1670897870,
"narHash": "sha256-nWLU48WlhVYm53cTUEDX8mZwZqdzObO6299hrCmdYcU=",
"lastModified": 1671934509,
"narHash": "sha256-flutX1FzFos0+Va7jCAE8F4g/3gzJ9DsOlYYRsQ+Kh4=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "b12b4d426e1050479e9d571c81cda2b7ae0256da",
"rev": "9bc97fe223048f09ec83de9b29b78766194e554c",
"type": "github"
},
"original": {
@ -333,7 +292,7 @@
"naersk": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
]
},
@ -353,11 +312,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1671525405,
"narHash": "sha256-MEgNxm/oRt5w4ycMENewfZQKOak0ixmjVPfXM96N1FA=",
"lastModified": 1672353432,
"narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cbe419ed4c8f98bd82d169c321d339ea30904f1f",
"rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
"type": "github"
},
"original": {
@ -369,11 +328,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1671459584,
"narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
"lastModified": 1671923641,
"narHash": "sha256-flPauiL5UrfRJD+1oAcEefpEIUqTqnyKScWe/UUU+lE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "87b58217c9a05edcf7630b9be32570f889217aef",
"rev": "939c05a176b8485971463c18c44f48e56a7801c9",
"type": "github"
},
"original": {
@ -399,35 +358,10 @@
"type": "github"
}
},
"radio-conf": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"nixpkgs"
],
"utils": [
"dump-dvb",
"utils"
]
},
"locked": {
"lastModified": 1665616750,
"narHash": "sha256-LKkr9h805FuJ+wXUatQ+cz7Vt59S9I7gN/1yzwmraZE=",
"owner": "dump-dvb",
"repo": "radio-conf",
"rev": "f6f42736cc1a1024c5da4cce69d56042499d81d3",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "radio-conf",
"type": "github"
}
},
"root": {
"inputs": {
"TLMS": "TLMS",
"documentation-src": "documentation-src",
"dump-dvb": "dump-dvb",
"microvm": "microvm",
"nixpkgs": "nixpkgs",
"sops-nix": "sops-nix"
@ -458,11 +392,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1671472949,
"narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
"lastModified": 1671937829,
"narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
"rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738",
"type": "github"
},
"original": {
@ -475,40 +409,106 @@
"inputs": {
"fenix": "fenix",
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1670618313,
"narHash": "sha256-kWvB6v3qJbX+UfcR+lTTJBHo7GUA/9BljBufAlVSkrk=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "stop-names",
"rev": "b04e91e0f3f74f6f92626a5af513abfdf8b989df",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "stop-names",
"type": "github"
}
},
"telegram-decoder": {
"inputs": {
"naersk": [
"TLMS",
"naersk"
],
"nixpkgs": [
"TLMS",
"nixpkgs"
],
"utils": [
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1671229231,
"narHash": "sha256-wm7SxCWVNVt4QePTUOI9zUOwyy3xKaen7dAplWdTtw0=",
"owner": "tlm-solutions",
"repo": "telegram-decoder",
"rev": "9a68ed95825dcc147ebdac115ae15615af4d4c4f",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "telegram-decoder",
"type": "github"
}
},
"tlms-rs": {
"inputs": {
"nixpkgs": [
"TLMS",
"nixpkgs"
]
},
"locked": {
"lastModified": 1672354602,
"narHash": "sha256-SesSDbmY8z4WULB1YMACSnID6XLg55wlCNnqsWcxH8c=",
"owner": "tlm-solutions",
"repo": "tlms.rs",
"rev": "2a0165b7d1852df9970b071bde811206dcb10b95",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "tlms.rs",
"type": "github"
}
},
"tlms-rust": {
"flake": false,
"locked": {
"lastModified": 1672266054,
"narHash": "sha256-yyqWR5PP2RemsJA+QFtdKHGOsE84snDS80Joilbm3Hk=",
"owner": "tlm-solutions",
"repo": "tlms.rs",
"rev": "a179ab4ca1cd7349eafd624533648eb5169fd4d5",
"type": "github"
},
"original": {
"owner": "tlm-solutions",
"repo": "tlms.rs",
"type": "github"
}
},
"trekkie": {
"inputs": {
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": "utils"
@ -516,13 +516,13 @@
"locked": {
"lastModified": 1669984314,
"narHash": "sha256-BolYmN+dSGcFWSBs2CDCcMyFaMgKUrPsbZwP0Reqw6M=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "trekkie",
"rev": "4f51485674d6e13e0e68df15c372e5a87774dcb8",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "trekkie",
"type": "github"
}
@ -560,29 +560,29 @@
"wartrammer": {
"inputs": {
"naersk": [
"dump-dvb",
"TLMS",
"naersk"
],
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"nixpkgs-unstable": "nixpkgs-unstable",
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1665780943,
"narHash": "sha256-4tnTVfz25GzY/1vCAITMeWkMqrzVRJUmpSMfqxcU0C4=",
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "wartrammer-40k",
"rev": "896550451f1e3b33c7fa8a08922efa3b6b73e4ad",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "wartrammer-40k",
"type": "github"
}
@ -590,24 +590,24 @@
"windshield": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"TLMS",
"nixpkgs"
],
"utils": [
"dump-dvb",
"TLMS",
"utils"
]
},
"locked": {
"lastModified": 1671752444,
"narHash": "sha256-jmvrzLePt4hcvcXxAsM0JImWKdxPbT08e5xUyPtNfxY=",
"owner": "dump-dvb",
"lastModified": 1671893969,
"narHash": "sha256-sBQnt/PfUReXJJ89JHrVeO0VvEVYQpYnhtadXQVm4eM=",
"owner": "tlm-solutions",
"repo": "windshield",
"rev": "774914702f0e2569bcc632a98484f15f23bb4a8e",
"rev": "100e62ad1a63cecfcde6e01d1814742bdec805e7",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"owner": "tlm-solutions",
"repo": "windshield",
"type": "github"
}

32
flake.nix
View File

@ -1,7 +1,7 @@
{
inputs = {
dump-dvb = {
url = github:dump-dvb/dump-dvb.nix;
TLMS = {
url = github:tlm-solutions/TLMS.nix;
inputs.nixpkgs.follows = "nixpkgs";
};
@ -18,14 +18,14 @@
};
documentation-src = {
url = github:dump-dvb/documentation;
url = github:tlm-solutions/documentation;
flake = false;
};
};
outputs =
inputs@{ self
, dump-dvb
, TLMS
, microvm
, nixpkgs
, sops-nix
@ -39,16 +39,16 @@
data-hoarder-modules = [
./modules/data-hoarder
./modules/dump-dvb
./modules/TLMS
sops-nix.nixosModules.sops
dump-dvb.nixosModules.default
TLMS.nixosModules.default
{
nixpkgs.overlays = [
dump-dvb.overlays.default
TLMS.overlays.default
(final: prev: {
inherit documentation-src;
options-docs = (pkgs.nixosOptionsDoc {
options = self.nixosConfigurations.data-hoarder.options.dump-dvb;
options = self.nixosConfigurations.data-hoarder.options.TLMS;
}).optionsCommonMark;
})
];
@ -58,7 +58,7 @@
stop-box-modules = [
{
nixpkgs.overlays = [
dump-dvb.overlays.default
TLMS.overlays.default
];
}
];
@ -75,11 +75,11 @@
# default modules
sops-nix.nixosModules.sops
dump-dvb.nixosModules.default
TLMS.nixosModules.default
./modules/traffic-stop-box
./modules/dump-dvb
./modules/TLMS
{
deployment-dvb.systemNumber = id;
deployment-TLMS.systemNumber = id;
}
] ++ stop-box-modules;
};
@ -140,7 +140,7 @@
docs = pkgs.callPackage ./pkgs/documentation.nix {
inherit documentation-src;
options-docs = (pkgs.nixosOptionsDoc {
options = self.nixosConfigurations.data-hoarder.options.dump-dvb;
options = self.nixosConfigurations.data-hoarder.options.TLMS;
}).optionsCommonMark;
};
}
@ -174,15 +174,15 @@
system = "x86_64-linux";
specialArgs = inputs;
modules = [
./modules/dump-dvb
./modules/TLMS
./hosts/watch-me-senpai
./modules/watch-me-senpai/secrets.nix
microvm.nixosModules.microvm
sops-nix.nixosModules.sops
dump-dvb.nixosModules.default
TLMS.nixosModules.default
{
nixpkgs.overlays = [
dump-dvb.overlays.default
TLMS.overlays.default
];
}
];

6
hardware/dell-wyse-3040.nix
View File

@ -1,11 +1,11 @@
{ config, lib, dump-dvb, ... }:
{ config, lib, TLMS, ... }:
{
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
imports = [
dump-dvb.nixosModules.disk-module
TLMS.nixosModules.disk-module
];
networking = {
interfaces.enp1s0.useDHCP = lib.mkDefault true;
@ -15,7 +15,7 @@
networking.useNetworkd = true;
networking.wireguard.enable = true;
deployment-dvb.net.iface.uplink = {
deployment-TLMS.net.iface.uplink = {
name = lib.mkDefault "enp1s0";
useDHCP = lib.mkDefault true;
};

2
hardware/rpi-3b-4b.nix
View File

@ -12,7 +12,7 @@
networking.useDHCP = lib.mkDefault true;
networking.interfaces.eth0.useDHCP = lib.mkDefault true;
deployment-dvb.net.iface.uplink = {
deployment-TLMS.net.iface.uplink = {
name = lib.mkDefault "eth0";
useDHCP = lib.mkDefault true;
};

2
hosts/data-hoarder/configuration.nix
View File

@ -42,7 +42,7 @@ in
# Set your time zone.
time.timeZone = "Europe/Berlin";
deployment-dvb.net.iface.uplink = {
deployment-TLMS.net.iface.uplink = {
name = "eth0";
useDHCP = false;
mac = mac_addr;

2
hosts/data-hoarder/wireguard_server.nix
View File

@ -7,7 +7,7 @@ in
networking.firewall.allowedUDPPorts = [ port ];
deployment-dvb.net.wg = {
deployment-TLMS.net.wg = {
ownEndpoint.host = "endpoint.dvb.solutions";
ownEndpoint.port = port;
addr4 = "10.13.37.1";

4
hosts/staging-data-hoarder/default.nix
View File

@ -50,7 +50,7 @@ in
sops.defaultSopsFile = self + /secrets/data-hoarder-staging/secrets.yaml;
deployment-dvb.net = {
deployment-TLMS.net = {
iface.uplink = {
name = "ens3";
mac = mac_addr;
@ -78,7 +78,7 @@ in
};
deployment-dvb.domain = "staging.dvb.solutions";
deployment-TLMS.domain = "staging.dvb.solutions";
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

2
hosts/traffic-stop-box/0/default.nix
View File

@ -3,5 +3,5 @@
"${self}/hardware/dell-wyse-3040.nix"
];
deployment-dvb.net.wg.publicKey = "qyStvzZdoqcjJJQckw4ZwvsQUa+8TBWtnsRxURqanno=";
deployment-TLMS.net.wg.publicKey = "qyStvzZdoqcjJJQckw4ZwvsQUa+8TBWtnsRxURqanno=";
}

2
hosts/traffic-stop-box/1/default.nix
View File

@ -3,5 +3,5 @@
"${self}/hardware/dell-wyse-3040.nix"
];
deployment-dvb.net.wg.publicKey = "dOPobdvfphx0EHmU7dd5ihslFzZi17XgRDQLMIUYa1w=";
deployment-TLMS.net.wg.publicKey = "dOPobdvfphx0EHmU7dd5ihslFzZi17XgRDQLMIUYa1w=";
}

2
hosts/traffic-stop-box/2/default.nix
View File

@ -3,5 +3,5 @@
"${self}/hardware/dell-wyse-3040.nix"
];
deployment-dvb.net.wg.publicKey = "4TUQCToGNhjsCgV9elYE/91Vd/RvMgvMXtF/1Dzlvxo=";
deployment-TLMS.net.wg.publicKey = "4TUQCToGNhjsCgV9elYE/91Vd/RvMgvMXtF/1Dzlvxo=";
}

2
hosts/traffic-stop-box/3/default.nix
View File

@ -3,5 +3,5 @@
"${self}/hardware/rpi-3b-4b.nix"
];
deployment-dvb.net.wg.publicKey = "w3AT3EahW1sCK8ZsR7sDTcQj1McXYeWx7fnfQFA7i3o=";
deployment-TLMS.net.wg.publicKey = "w3AT3EahW1sCK8ZsR7sDTcQj1McXYeWx7fnfQFA7i3o=";
}

4
hosts/traffic-stop-box/4/default.nix
View File

@ -8,7 +8,7 @@ let eth = "enp1s0"; in
networking.useDHCP = false;
networking.interfaces."${eth}".useDHCP = false;
deployment-dvb.net.iface.uplink = {
deployment-TLMS.net.iface.uplink = {
name = eth;
useDHCP = false;
addr4 = "141.30.30.149/25";
@ -23,6 +23,6 @@ let eth = "enp1s0"; in
];
};
deployment-dvb.net.wg.publicKey = "B0wPH0jUxaatRncHMkgDEQ+DzvlbTBrVJY4etxqQgG8=";
deployment-TLMS.net.wg.publicKey = "B0wPH0jUxaatRncHMkgDEQ+DzvlbTBrVJY4etxqQgG8=";
}

2
hosts/traffic-stop-box/6/default.nix
View File

@ -11,5 +11,5 @@
"sk-ssh-ed25519@openssh.com aaaagnnrlxnzac1lzdi1nte5qg9wzw5zc2guy29taaaaipzbd00cbfpxzuc8eb6sljaafnf1hgs6vci1rzcncyocaaaabhnzado="
];
deployment-dvb.net.wg.publicKey = "NuLDNmxuHHzDXJSIOPSoihEhLWjARRtavuQvWirNR2I=";
deployment-TLMS.net.wg.publicKey = "NuLDNmxuHHzDXJSIOPSoihEhLWjARRtavuQvWirNR2I=";
}

2
hosts/traffic-stop-box/7/default.nix
View File

@ -11,5 +11,5 @@
"sk-ssh-ed25519@openssh.com aaaagnnrlxnzac1lzdi1nte5qg9wzw5zc2guy29taaaaipzbd00cbfpxzuc8eb6sljaafnf1hgs6vci1rzcncyocaaaabhnzado="
];
deployment-dvb.net.wg.publicKey = "sMsdY7dSjlYeIFMqjkh4pJ/ftAYXlyRuxDGbdnGLpEQ=";
deployment-TLMS.net.wg.publicKey = "sMsdY7dSjlYeIFMqjkh4pJ/ftAYXlyRuxDGbdnGLpEQ=";
}

2
hosts/traffic-stop-box/8/default.nix
View File

@ -9,5 +9,5 @@
users.users.root.openssh.authorizedKeys.keys = [
];
deployment-dvb.net.wg.publicKey = "dL9JGsBhaTOmXgGEH/N/GCHbQgVHEjBvIMaRtCsHBHw=";
deployment-TLMS.net.wg.publicKey = "dL9JGsBhaTOmXgGEH/N/GCHbQgVHEjBvIMaRtCsHBHw=";
}

2
hosts/traffic-stop-box/9/default.nix
View File

@ -10,5 +10,5 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJO/8PRzEqW20vnADv5xJrV5AlQ9bS8251AyQACyFMz+ dumbdvb_clarity"
];
deployment-dvb.net.wg.publicKey = "j2hGr2rVv7T9kJE15c2IFWjmk0dXuJPev2BXiHZUKk8=";
deployment-TLMS.net.wg.publicKey = "j2hGr2rVv7T9kJE15c2IFWjmk0dXuJPev2BXiHZUKk8=";
}

4
modules/dump-dvb/base.nix → modules/TLMS/base.nix
View File

@ -97,6 +97,6 @@ in
hardstatus string "%w"
'';
dump-dvb.stopsJson = "${pkgs.stops}/stop/all.json";
dump-dvb.graphJson = "${pkgs.stops}/graph/all.json";
TLMS.stopsJson = "${pkgs.stops}/stop/all.json";
TLMS.graphJson = "${pkgs.stops}/graph/all.json";
}

0
modules/dump-dvb/default.nix → modules/TLMS/default.nix
View File

4
modules/dump-dvb/general-options.nix → modules/TLMS/general-options.nix
View File

@ -1,13 +1,13 @@
{ lib, ... }:
with lib; {
options = {
deployment-dvb.systemNumber = mkOption {
deployment-TLMS.systemNumber = mkOption {
type = types.int;
default = 0;
description = "number of the system";
};
deployment-dvb.domain = mkOption {
deployment-TLMS.domain = mkOption {
type = types.str;
default = "dvb.solutions";
description = "domain the server is running on";

4
modules/dump-dvb/net.nix → modules/TLMS/net.nix
View File

@ -1,9 +1,9 @@
{ lib, config, utils, ... }:
let
cfg = config.deployment-dvb.net;
cfg = config.deployment-TLMS.net;
in
{
options.deployment-dvb.net = with lib; {
options.deployment-TLMS.net = with lib; {
iface.uplink = {
name = mkOption {
type = types.nullOr types.str;

22
modules/dump-dvb/wg.nix → modules/TLMS/wg.nix
View File

@ -1,8 +1,8 @@
{ lib, config, self, ... }:
let
cfg = config.deployment-dvb.net.wg;
cfg = config.deployment-TLMS.net.wg;
in {
options.deployment-dvb.net.wg = with lib; {
options.deployment-TLMS.net.wg = with lib; {
ownEndpoint.host = mkOption {
type = types.nullOr types.str;
@ -53,22 +53,22 @@ in {
keepalive = 25;
# helpers
peer-systems = (lib.filter (x: (x.config.deployment-dvb.net.wg.addr4 != cfg.addr4) && (!isNull x.config.deployment-dvb.net.wg.addr4))
peer-systems = (lib.filter (x: (x.config.deployment-TLMS.net.wg.addr4 != cfg.addr4) && (!isNull x.config.deployment-TLMS.net.wg.addr4))
(lib.attrValues self.nixosConfigurations));
endpoint =
let
ep = (lib.filter (x:
x.config.deployment-dvb.net.wg.addr4 != cfg.addr4
&& (!isNull x.config.deployment-dvb.net.wg.ownEndpoint.host))
x.config.deployment-TLMS.net.wg.addr4 != cfg.addr4
&& (!isNull x.config.deployment-TLMS.net.wg.ownEndpoint.host))
(lib.attrValues self.nixosConfigurations));
in
assert lib.assertMsg (lib.length ep == 1) "there should be exactly one endpoint"; ep;
peers = map (x: {
wireguardPeerConfig = {
PublicKey = x.config.deployment-dvb.net.wg.publicKey;
AllowedIPs = [ "${x.config.deployment-dvb.net.wg.addr4}/32" ];
PublicKey = x.config.deployment-TLMS.net.wg.publicKey;
AllowedIPs = [ "${x.config.deployment-TLMS.net.wg.addr4}/32" ];
PersistentKeepalive = keepalive;
};
}) peer-systems;
@ -76,9 +76,9 @@ in {
ep = [ {
wireguardPeerConfig =
let x = lib.elemAt endpoint 0; in {
PublicKey = x.config.deployment-dvb.net.wg.publicKey;
AllowedIPs = [ "${x.config.deployment-dvb.net.wg.addr4}/${toString cfg.prefix4}" ];
Endpoint = with x.config.deployment-dvb.net.wg.ownEndpoint; "${host}:${toString port}";
PublicKey = x.config.deployment-TLMS.net.wg.publicKey;
AllowedIPs = [ "${x.config.deployment-TLMS.net.wg.addr4}/${toString cfg.prefix4}" ];
Endpoint = with x.config.deployment-TLMS.net.wg.ownEndpoint; "${host}:${toString port}";
PersistentKeepalive = keepalive;
};
} ];
@ -87,7 +87,7 @@ in {
dvbwg-netdev = {
Kind = "wireguard";
Name = dvbwg-name;
Description = "dump-dvb enterprise, highly available, biocomputing-neural-network maintained, converged network";
Description = "TLMS enterprise, highly available, biocomputing-neural-network maintained, converged network";
};
dvbwg-wireguard = {

4
modules/data-hoarder/click.nix
View File

@ -1,11 +1,11 @@
{ pkgs, config, ... }: {
services.nginx = {
enable = true;
virtualHosts."click.${config.deployment-dvb.domain}" = {
virtualHosts."click.${config.deployment-TLMS.domain}" = {
enableACME = true;
forceSSL = true;
locations."/" = {
root = if (config.deployment-dvb.domain == "dvb.solutions") then "${pkgs.click}/web/" else "${pkgs.click-staging}/web/";
root = if (config.deployment-TLMS.domain == "dvb.solutions") then "${pkgs.click}/web/" else "${pkgs.click-staging}/web/";
index = "index.html";
tryFiles = "$uri /index.html";
};

14
modules/data-hoarder/data-accumulator.nix
View File

@ -1,6 +1,6 @@
{ config, ... }:
{
dump-dvb.dataAccumulator = {
TLMS.dataAccumulator = {
enable = true;
host = "0.0.0.0";
port = 8080;
@ -12,13 +12,13 @@
GRPC = [
{
name = "API";
host = config.dump-dvb.api.GRPC.host;
port = config.dump-dvb.api.GRPC.port;
host = config.TLMS.api.GRPC.host;
port = config.TLMS.api.GRPC.port;
}
{
name = "FUNNEL";
host = config.dump-dvb.funnel.GRPC.host;
port = config.dump-dvb.funnel.GRPC.port;
host = config.TLMS.funnel.GRPC.host;
port = config.TLMS.funnel.GRPC.port;
}
];
};
@ -32,12 +32,12 @@
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"dump.${config.deployment-dvb.domain}" = {
"dump.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.dump-dvb.dataAccumulator; "http://${host}:${toString port}/";
proxyPass = with config.TLMS.dataAccumulator; "http://${host}:${toString port}/";
};
};
};

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

@ -1,5 +1,5 @@
{ config, ... }: {
dump-dvb.datacare = {
TLMS.datacare = {
enable = true;
host = "127.0.0.1";
port = 8070;
@ -21,12 +21,12 @@
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"datacare.${config.deployment-dvb.domain}" = {
"datacare.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.dump-dvb.datacare; "http://${host}:${toString port}/";
proxyPass = with config.TLMS.datacare; "http://${host}:${toString port}/";
proxyWebsockets = true;
};
};

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

@ -8,7 +8,7 @@ in
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"docs.${config.deployment-dvb.domain}" = {
"docs.${config.deployment-TLMS.domain}" = {
enableACME = true;
forceSSL = true;
locations = {

10
modules/data-hoarder/dvb-api.nix
View File

@ -3,7 +3,7 @@ let
service_number = 1;
in
{
dump-dvb.api = {
TLMS.api = {
enable = true;
GRPC = {
host = "127.0.0.1";
@ -11,8 +11,8 @@ in
};
port = 9000 + service_number;
graphFile = config.dump-dvb.graphJson;
stopsFile = config.dump-dvb.stopsJson;
graphFile = config.TLMS.graphJson;
stopsFile = config.TLMS.stopsJson;
workerCount = 6;
};
@ -21,12 +21,12 @@ in
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"api.${config.deployment-dvb.domain}" = {
"api.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.dump-dvb.api; "http://127.0.0.1:${toString port}/";
proxyPass = with config.TLMS.api; "http://127.0.0.1:${toString port}/";
proxyWebsockets = true;
};
};

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

@ -4,7 +4,7 @@
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"files.${config.deployment-dvb.domain}" = {
"files.${config.deployment-TLMS.domain}" = {
enableACME = true;
forceSSL = true;
root = "/var/lib/pub-files/";

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

@ -35,7 +35,7 @@
job_name = "funnel-connections";
static_configs = [
{
targets = [ "127.0.0.1:${toString config.dump-dvb.funnel.metrics.port}"];
targets = [ "127.0.0.1:${toString config.TLMS.funnel.metrics.port}"];
}
];
}
@ -64,7 +64,7 @@
params = { module = [ "http_2xx" ]; };
static_configs = [{
targets = [
"api.${config.deployment-dvb.domain}"
"api.${config.deployment-TLMS.domain}"
];
}];
relabel_configs = [
@ -92,7 +92,7 @@
# visualizer
grafana = {
settings.server = {
domain = "monitoring.${config.deployment-dvb.domain}";
domain = "monitoring.${config.deployment-TLMS.domain}";
http_port = 2342;
http_addr = "127.0.0.1";
};

4
modules/data-hoarder/map.nix
View File

@ -4,7 +4,7 @@
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"map.${config.deployment-dvb.domain}" = {
"map.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
extraConfig = ''
@ -35,7 +35,7 @@
'';
in {
"/" = {
root = if (config.deployment-dvb.domain == "dvb.solutions") then "${pkgs.windshield}/bin/" else "${pkgs.windshield-staging}/bin/";
root = if (config.deployment-TLMS.domain == "dvb.solutions") then "${pkgs.windshield}/bin/" else "${pkgs.windshield-staging}/bin/";
index = "index.html";
tryFiles = "$uri /index.html =404";

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

@ -25,7 +25,7 @@ in
networking.firewall.allowedTCPPorts = [ 80 443 ];
security.acme.acceptTerms = true;
security.acme.defaults.email = "dump-dvb@protonmail.com";
security.acme.defaults.email = "TLMS@protonmail.com";
services.nginx = {
recommendedTlsSettings = true;
recommendedOptimisation = true;

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

@ -1,4 +1,4 @@
{ lib, pkgs, config, dump-dvb, ... }: {
{ lib, pkgs, config, TLMS, ... }: {
services.postgresql = {
enable = true;
@ -18,7 +18,7 @@
];
};
environment.systemPackages = [ dump-dvb.packages.x86_64-linux.run-database-migration ];
environment.systemPackages = [ TLMS.packages.x86_64-linux.run-database-migration ];
systemd.services.postgresql = {
unitConfig = {
@ -36,7 +36,7 @@
$PSQL -c "ALTER ROLE grafana WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_grafana.path})';"
export DATABASE_URL=postgres:///dvbdump
${dump-dvb.packages.x86_64-linux.run-database-migration}/bin/run-migration
${TLMS.packages.x86_64-linux.run-database-migration}/bin/run-migration
unset DATABASE_URL
'';
};

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

@ -1,8 +1,8 @@
{ config, ... }:
let
datacare-user = config.dump-dvb.datacare.user;
data-accumulator-user = config.dump-dvb.dataAccumulator.user;
trekkie-user = config.dump-dvb.trekkie.user;
datacare-user = config.TLMS.datacare.user;
data-accumulator-user = config.TLMS.dataAccumulator.user;
trekkie-user = config.TLMS.trekkie.user;
in
{
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];

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

@ -3,7 +3,7 @@ let
serice_number = 2;
in
{
dump-dvb.funnel = {
TLMS.funnel = {
enable = true;
GRPC = {
host = "127.0.0.1";
@ -17,19 +17,19 @@ in
port = 9010;
host = "0.0.0.0";
};
apiAddress = "127.0.0.1:${toString config.dump-dvb.api.port}";
apiAddress = "127.0.0.1:${toString config.TLMS.api.port}";
};
services = {
nginx = {
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"socket.${config.deployment-dvb.domain}" = {
"socket.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.dump-dvb.funnel.defaultWebsocket; "http://${host}:${toString port}/";
proxyPass = with config.TLMS.funnel.defaultWebsocket; "http://${host}:${toString port}/";
proxyWebsockets = true;
};
};

10
modules/data-hoarder/trekkie.nix
View File

@ -1,6 +1,6 @@
{ config, ... }:
{
dump-dvb.trekkie = {
TLMS.trekkie = {
enable = true;
host = "0.0.0.0";
saltPath = config.sops.secrets.postgres_password_hash_salt.path;
@ -24,20 +24,20 @@
services = {
redis.servers."trekkie" = {
enable = true;
bind = config.dump-dvb.trekkie.redis.host;
port = config.dump-dvb.trekkie.redis.port;
bind = config.TLMS.trekkie.redis.host;
port = config.TLMS.trekkie.redis.port;
};
nginx = {
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"trekkie.${config.deployment-dvb.domain}" = {
"trekkie.${config.deployment-TLMS.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = with config.dump-dvb.trekkie; "http://${host}:${toString port}/";
proxyPass = with config.TLMS.trekkie; "http://${host}:${toString port}/";
};
};
};

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

@ -2,7 +2,7 @@
services.nginx = {
enable = true;
virtualHosts = {
"${config.deployment-dvb.domain}" = {
"${config.deployment-TLMS.domain}" = {
enableACME = true;
forceSSL = true;
locations = {

2
modules/traffic-stop-box/configuration.nix
View File

@ -3,7 +3,7 @@
{
boot.tmpOnTmpfs = true;
networking.hostName = "traffic-stop-box-${toString config.deployment-dvb.systemNumber}"; # Define your hostname.
networking.hostName = "traffic-stop-box-${toString config.deployment-TLMS.systemNumber}"; # Define your hostname.
# Set your time zone.
time.timeZone = "Europe/Berlin";

8
modules/traffic-stop-box/radio-config.nix
View File

@ -1,7 +1,7 @@
{ config, lib, self, ... }:
let
file = with config.deployment-dvb; "${self}/hosts/traffic-stop-box/${toString systemNumber}/config_${toString systemNumber}.json";
file = with config.deployment-TLMS; "${self}/hosts/traffic-stop-box/${toString systemNumber}/config_${toString systemNumber}.json";
receiver_configs = [
{ frequency = 170795000; offset = 19550; device = "hackrf=0"; RF = 14; IF = 8; BB = 42; } # dresden - barkhausen
{ frequency = 170795000; offset = 19400; device = "hackrf=0"; RF = 14; IF = 8; BB = 42; } # dresden - zentralwerk
@ -15,10 +15,10 @@ let
{ frequency = 152830000; offset = 20000; device = ""; RF = 14; IF = 32; BB = 42; } # Hannover-greater-area
];
receiver_config = lib.elemAt receiver_configs config.deployment-dvb.systemNumber;
receiver_config = lib.elemAt receiver_configs config.deployment-TLMS.systemNumber;
in
{
dump-dvb.gnuradio = {
TLMS.gnuradio = {
enable = true;
frequency = receiver_config.frequency;
offset = receiver_config.offset;
@ -27,7 +27,7 @@ in
IF = receiver_config.IF;
BB = receiver_config.BB;
};
dump-dvb.telegramDecoder = {
TLMS.telegramDecoder = {
enable = true;
server = [ "http://10.13.37.1:8080" "http://10.13.37.5:8080" ];
configFile = file;

2
modules/traffic-stop-box/secrets.nix
View File

@ -1,6 +1,6 @@
{ config, self, ... }:
{
sops.defaultSopsFile = self + /secrets/traffic-stop-box-${toString config.deployment-dvb.systemNumber}/secrets.yaml;
sops.defaultSopsFile = self + /secrets/traffic-stop-box-${toString config.deployment-TLMS.systemNumber}/secrets.yaml;
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
sops.secrets.telegram-decoder-token.owner = config.users.users.telegram-decoder.name;

4
modules/traffic-stop-box/wireguard-client.nix
View File

@ -6,8 +6,8 @@
sops.secrets.wg-seckey = {
owner = config.users.users.systemd-network.name;
};
deployment-dvb.net.wg = {
addr4 = lib.mkDefault "10.13.37.${toString (config.deployment-dvb.systemNumber + 100)}";
deployment-TLMS.net.wg = {
addr4 = lib.mkDefault "10.13.37.${toString (config.deployment-TLMS.systemNumber + 100)}";
prefix4 = 24;
privateKeyFile = lib.mkDefault config.sops.secrets.wg-seckey.path;
};

6
modules/watch-me-senpai/default.nix
View File

@ -3,12 +3,12 @@ let
mac_addr = "00:de:5b:f9:e2:3d";
in {
imports = [
../dump-dvb/default.nix
../TLMS/default.nix
./secrets.nix
];
sops.defaultSopsFile = ../../secrets/watch-me-senpai/secrets.yaml;
deployment-dvb.net = {
deployment-TLMS.net = {
iface.uplink = {
name = "eth0";
mac = mac_addr;
@ -35,5 +35,5 @@ in {
};
deployment-dvb.domain = "dvb.solutions";
deployment-TLMS.domain = "dvb.solutions";
}

2
modules/watch-me-senpai/wireguard_server.nix
View File

@ -8,7 +8,7 @@ in
networking.firewall.allowedUDPPorts = [ port ];
deployment-dvb.net = {
deployment-TLMS.net = {
/*
iface.uplink = {
name = "ens3";

2
pkgs/deployment.nix
View File

@ -2,7 +2,7 @@
let
installScript = (system:
let ip = "10.13.37.${toString (system.config.deployment-dvb.systemNumber + 100)}";
let ip = "10.13.37.${toString (system.config.deployment-TLMS.systemNumber + 100)}";
in
(pkgs.writeScriptBin "deploy" ''
#!${pkgs.runtimeShell}

2
pkgs/documentation.nix
View File

@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Documentation for DVB-Dump project";
homepage = "https://github.com/dump-dvb/documentation";
homepage = "https://github.com/TLMS/documentation";
};
}