From d0a7428b34172840976621b58537de750da1af47 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 31 Oct 2021 23:49:12 +0100 Subject: [PATCH] radiobert: rename dump1090 to readsb --- hosts/radiobert/default.nix | 2 +- hosts/radiobert/{dump1090.nix => readsb.nix} | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) rename hosts/radiobert/{dump1090.nix => readsb.nix} (84%) diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix index af6626e3..bf03fe3e 100644 --- a/hosts/radiobert/default.nix +++ b/hosts/radiobert/default.nix @@ -2,6 +2,6 @@ imports = [ ./base.nix ./soapysdr.nix - ./dump1090.nix + ./readsb.nix ]; } diff --git a/hosts/radiobert/dump1090.nix b/hosts/radiobert/readsb.nix similarity index 84% rename from hosts/radiobert/dump1090.nix rename to hosts/radiobert/readsb.nix index dc1a3eef..9c5c6b9f 100644 --- a/hosts/radiobert/dump1090.nix +++ b/hosts/radiobert/readsb.nix @@ -10,10 +10,7 @@ group = "dump1090"; }; users.groups.dump1090 = {}; - systemd.tmpfiles.rules = [ - "d /tmp/dump1090 0755 dump1090 dump1090 -" - ]; - systemd.services.dump1090 = { + systemd.services.readsb = { wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.readsb}/bin/readsb --modeac --aggressive --dcfilter --quiet --gain=-10 --lon=13.7281 --lat=51.081 --net --net-sbs-port=30003"; @@ -21,8 +18,6 @@ Group = "dump1090"; ProtectSystem = "full"; ProtectHome = true; - WorkingDirectory = "/tmp/dump1090"; - WritablePaths = "/tmp/dump1090"; Restart = "always"; RestartSec = "10s"; }; @@ -30,7 +25,7 @@ # SHIM because readsb has no web server like dump1090 systemd.services.sbs2json = { wantedBy = [ "multi-user.target" ]; - requires = [ "dump1090.service" ]; + requires = [ "readsb.service" ]; serviceConfig = { ExecStart = "${pkgs.ruby}/bin/ruby ${./sbs2json.rb}"; User = "dump1090"; @@ -48,7 +43,7 @@ }; systemd.services.dump1090-influxdb = { wantedBy = [ "multi-user.target" ]; - requires = [ "dump1090.service" ]; + requires = [ "readsb.service" ]; serviceConfig = { ExecStart = "${pkgs.dump1090-influxdb}/bin/dump1090-influxdb"; User = "dump1090-influxdb";