c3d2/nix-config
c3d2/nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

radiobert: upgrade from readsb to dump1090

Browse Source
This commit is contained in:
Astro 2023-06-12 22:33:45 +02:00
parent acd947e628
commit 32257815dd
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hosts/radiobert/readsb.nix → hosts/radiobert/adsb.nix
View File

@ -7,7 +7,7 @@ let
makeMlatClientService = args: { makeMlatClientService = args: {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "readsb.service" ]; requires = [ "dump1090.service" ];
serviceConfig = { serviceConfig = {
User = "mlat-client"; User = "mlat-client";
Group = "adsb"; Group = "adsb";
@ -27,7 +27,7 @@ in {
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
readsb dump1090
]; ];
sops.secrets = { sops.secrets = {
@ -45,7 +45,7 @@ in {
isSystemUser = true; isSystemUser = true;
group = "adsb"; group = "adsb";
}; };
readsb = { dump1090 = {
isSystemUser = true; isSystemUser = true;
group = "adsb"; group = "adsb";
}; };
@ -59,7 +59,7 @@ in {
systemd.services = { systemd.services = {
dump1090-influxdb = { dump1090-influxdb = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "readsb.service" ]; requires = [ "dump1090.service" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.dump1090-influxdb}/bin/dump1090-influxdb"; ExecStart = "${pkgs.dump1090-influxdb}/bin/dump1090-influxdb";
User = "dump1090-influxdb"; User = "dump1090-influxdb";
@ -109,11 +109,11 @@ in {
# Feeds https://adsb.chaos-consulting.de/map/ # Feeds https://adsb.chaos-consulting.de/map/
mlat-client-chaos-consulting = makeMlatClientService "--server ${config.services.stunnel.clients.mlat-client-chaos-consulting.accept} --user \"$(cat ${config.sops.secrets."chaos-consulting/user".path})\""; mlat-client-chaos-consulting = makeMlatClientService "--server ${config.services.stunnel.clients.mlat-client-chaos-consulting.accept} --user \"$(cat ${config.sops.secrets."chaos-consulting/user".path})\"";
readsb = { dump1090 = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.readsb}/bin/readsb --modeac --aggressive --fix --stats-range --dcfilter --quiet --gain=-10 --lon=${lon} --lat=${lat} --net --net-ro-port=30002 --net-sbs-port=30003 --net-bo-port=30005 --net-vrs-port=30006 --net-beast-reduce-interval 1 --net-connector feed.adsbexchange.com,30005,beast_reduce_out"; ExecStart = "${pkgs.dump1090}/bin/dump1090 --modeac --enable-amp --quiet --fix-2bit --forward-mlat --fix --stats-range --lon ${lon} --lat ${lat} --net --net-ro-port 30002 --net-sbs-port 30003 --net-bo-port 30005";
User = "readsb"; User = "dump1090";
Group = "adsb"; Group = "adsb";
ProtectSystem = "full"; ProtectSystem = "full";
ProtectHome = true; ProtectHome = true;
@ -122,10 +122,10 @@ in {
}; };
}; };
# SHIM because readsb has no web server like dump1090 # SHIM because dump1090 has no web server like dump1090
sbs2json = { sbs2json = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "readsb.service" ]; requires = [ "dump1090.service" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.heliwatch.http-json}/bin/http-json"; ExecStart = "${pkgs.heliwatch.http-json}/bin/http-json";
User = "sbs2json"; User = "sbs2json";

4
hosts/radiobert/default.nix
View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
./soapysdr.nix ./soapysdr.nix
./readsb.nix ./adsb.nix
]; ];
c3d2 = { c3d2 = {
@ -126,7 +126,7 @@
''; '';
systemd.services = { systemd.services = {
soapysdr-server.serviceConfig.CPUAffinity = "2-2"; soapysdr-server.serviceConfig.CPUAffinity = "2-2";
readsdb.serviceConfig.CPUAffinity = "3-3"; dump1090.serviceConfig.CPUAffinity = "3-3";
}; };
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "21.05"; # Did you read the comment?