Commit b51a6c35 authored by Robert Hensing's avatar Robert Hensing
Browse files

nixos/system/service: Use copy of escapeSystemdExecArgs 

This unblocks modular services while providing opportunity to
improve this when a solution is agreed on.
parent d20a5749

nixos/modules/system/service/systemd/service.nix

+46 −2
Original line number Diff line number Diff line
@@ -5,7 +5,51 @@ 
  ...

}:

let

  inherit (lib) mkOption types;

  inherit (lib)

    concatMapStringsSep

    isDerivation

    isInt

    isFloat

    isPath

    isString

    mkOption

    replaceStrings

    types

    ;

  inherit (builtins) toJSON;



  # Local copy of systemd exec argument escaping function.

  # TODO: This could perhaps be deduplicated, but it is unclear where it should go.

  #       Preferably, we don't create a hard dependency on NixOS here, so that this

  #       module can be reused in a non-NixOS context, such as mutaable services

  #       in /run/systemd/system.



  # Quotes an argument for use in Exec* service lines.

  # systemd accepts "-quoted strings with escape sequences, toJSON produces

  # a subset of these.

  # Additionally we escape % to disallow expansion of % specifiers. Any lone ;

  # in the input will be turned it ";" and thus lose its special meaning.

  # Every $ is escaped to $$, this makes it unnecessary to disable environment

  # substitution for the directive.

  escapeSystemdExecArg =

    arg:

    let

      s =

        if isPath arg then

          "${arg}"

        else if isString arg then

          arg

        else if isInt arg || isFloat arg || isDerivation arg then

          toString arg

        else

          throw "escapeSystemdExecArg only allows strings, paths, numbers and derivations";

    in

    replaceStrings [ "%" "$" ] [ "%%" "$$" ] (toJSON s);



  # Quotes a list of arguments into a single string for use in a Exec*

  # line.

  escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;



in

{

  imports = [
@@ -69,7 +113,7 @@ in 
        Restart = lib.mkDefault "always";

        RestartSec = lib.mkDefault "5";

        ExecStart = [

          (systemdPackage.functions.escapeSystemdExecArgs config.process.argv)

          (escapeSystemdExecArgs config.process.argv)

        ];

      };

    };