From 8981cb7b6849ac3d69293d54f7af0538365a75a4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 5 Jun 2018 22:11:27 +0900 Subject: [PATCH 1/2] owamp: init at 3.5.6 A tool for performing one-way active measurements. https://github.com/perfsonar/owamp This is the reference implementation for the IETF rfc https://tools.ietf.org/html/rfc4656 --- .../applications/networking/owamp/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/owamp/default.nix diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix new file mode 100644 index 000000000000..293c67164835 --- /dev/null +++ b/pkgs/applications/networking/owamp/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, fetchFromGitHub +, autoconf, automake, mandoc }: + +stdenv.mkDerivation rec { + name = "owamp-${version}"; + version = "3.5.6"; + buildInputs = [ autoconf automake mandoc ]; + src = fetchFromGitHub { + owner = "perfsonar"; + repo = "owamp"; + rev = version; + sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7"; + fetchSubmodules = true; + }; + + preConfigure = '' + I2util/bootstrap.sh + ./bootstrap + ''; + + meta = with stdenv.lib; { + homepage = http://software.internet2.edu/owamp/; + description = ''A tool for performing one-way active measurements''; + platforms = platforms.linux; + maintainers = [maintainers.teto]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae5da9a8a622..6b6a35a41b57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17348,6 +17348,8 @@ with pkgs; osmctools = callPackage ../applications/misc/osmctools { }; + owamp = callPackage ../applications/networking/owamp { }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; From 358296c05a790777e11938f3eb97febcb8da0685 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 5 Jun 2018 22:15:28 +0900 Subject: [PATCH 2/2] owamp: adding module You can retrieve the one way latency between your client and the remote host via owping. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/owamp.nix | 47 +++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/networking/owamp.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 65b4cfd7e0b5..1084e5ca17b6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -536,6 +536,7 @@ ./services/networking/openntpd.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix + ./services/networking/owamp.nix ./services/networking/pdnsd.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix new file mode 100644 index 000000000000..a0d3e70d8e57 --- /dev/null +++ b/nixos/modules/services/networking/owamp.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.owamp; +in +{ + + ###### interface + + options = { + services.owamp.enable = mkEnableOption ''Enable OWAMP server''; + }; + + + ###### implementation + + config = mkIf cfg.enable { + users.extraUsers = singleton { + name = "owamp"; + group = "owamp"; + description = "Owamp daemon"; + }; + + users.extraGroups = singleton { + name = "owamp"; + }; + + systemd.services.owamp = { + description = "Owamp server"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart="${pkgs.owamp}/bin/owampd -R /run/owamp -d /run/owamp -v -Z "; + PrivateTmp = true; + Restart = "always"; + Type="simple"; + User = "owamp"; + Group = "owamp"; + RuntimeDirectory = "owamp"; + StateDirectory = "owamp"; + AmbientCapabilities = "cap_net_bind_service"; + }; + }; + }; +}