rename logshipper -> logtap
- it matches the executable name - it doesn't ship anything anyway, it's just plumbing
This commit is contained in:
@@ -31,7 +31,7 @@ let
|
|||||||
pipecmds =
|
pipecmds =
|
||||||
[ "${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1" ]
|
[ "${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1" ]
|
||||||
++ (lib.optional (cfg ? persistent && cfg.persistent.enable) "/bin/tee /dev/pmsg0")
|
++ (lib.optional (cfg ? persistent && cfg.persistent.enable) "/bin/tee /dev/pmsg0")
|
||||||
++ (lib.optional cfg.shipping.enable "${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
|
++ (lib.optional cfg.shipping.enable "${pkgs.logtap}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
#!${execline}/bin/execlineb -P
|
#!${execline}/bin/execlineb -P
|
||||||
|
@@ -100,7 +100,7 @@ in
|
|||||||
levitate = callPackage ./levitate { };
|
levitate = callPackage ./levitate { };
|
||||||
libubootenv = callPackage ./libubootenv { };
|
libubootenv = callPackage ./libubootenv { };
|
||||||
linotify = callPackage ./linotify { };
|
linotify = callPackage ./linotify { };
|
||||||
logshipper = callPackage ./logshipper { };
|
logtap = callPackage ./logtap { };
|
||||||
lualinux = callPackage ./lualinux { };
|
lualinux = callPackage ./lualinux { };
|
||||||
|
|
||||||
# we need to build real lzma instead of using xz, because the lzma
|
# we need to build real lzma instead of using xz, because the lzma
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "logshipper";
|
name = "logtap";
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
src = ./.;
|
src = ./.;
|
||||||
}
|
}
|
Reference in New Issue
Block a user