diff --git a/hosts/radiobert/readsb.nix b/hosts/radiobert/adsb.nix similarity index 87% rename from hosts/radiobert/readsb.nix rename to hosts/radiobert/adsb.nix index 7200e9ed..01c81145 100644 --- a/hosts/radiobert/readsb.nix +++ b/hosts/radiobert/adsb.nix @@ -7,7 +7,7 @@ let makeMlatClientService = args: { wantedBy = [ "multi-user.target" ]; - requires = [ "readsb.service" ]; + requires = [ "dump1090.service" ]; serviceConfig = { User = "mlat-client"; Group = "adsb"; @@ -27,7 +27,7 @@ in { ]; environment.systemPackages = with pkgs; [ - readsb + dump1090 ]; sops.secrets = { @@ -45,7 +45,7 @@ in { isSystemUser = true; group = "adsb"; }; - readsb = { + dump1090 = { isSystemUser = true; group = "adsb"; }; @@ -59,7 +59,7 @@ in { systemd.services = { dump1090-influxdb = { wantedBy = [ "multi-user.target" ]; - requires = [ "readsb.service" ]; + requires = [ "dump1090.service" ]; serviceConfig = { ExecStart = "${pkgs.dump1090-influxdb}/bin/dump1090-influxdb"; User = "dump1090-influxdb"; @@ -109,11 +109,11 @@ in { # 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})\""; - readsb = { + dump1090 = { wantedBy = [ "multi-user.target" ]; 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"; - User = "readsb"; + 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 = "dump1090"; Group = "adsb"; ProtectSystem = "full"; 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 = { wantedBy = [ "multi-user.target" ]; - requires = [ "readsb.service" ]; + requires = [ "dump1090.service" ]; serviceConfig = { ExecStart = "${pkgs.heliwatch.http-json}/bin/http-json"; User = "sbs2json"; diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix index 8b0195de..353249de 100644 --- a/hosts/radiobert/default.nix +++ b/hosts/radiobert/default.nix @@ -3,7 +3,7 @@ { imports = [ ./soapysdr.nix - ./readsb.nix + ./adsb.nix ]; c3d2 = { @@ -126,7 +126,7 @@ ''; systemd.services = { 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?