diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-12 18:11:37 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-12 18:11:37 +0100 |
| commit | 28fa4a2f03e2232d95dec9dc2b8ef40857d725db (patch) | |
| tree | 60a16516608d1b34c78b1a19bfdac0c9188f8412 /nixos | |
| parent | 852e9c309638c3e1c0e611c70a2b443d52455aca (diff) | |
| download | nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.gz nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.bz2 nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.lz nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.xz nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.zst nixlib-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.zip | |
Escape all shell arguments uniformly
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/acme.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/opendkim.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/taskserver/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/ejabberd.nix | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index ef6da788e619..f646602221a4 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -187,7 +187,7 @@ in script = '' cd '${cpath}' set +e - simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} + simp_le ${escapeShellArgs cmdline} EXITCODE=$? set -e echo "$EXITCODE" > /tmp/lastExitCode diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index af996758f41f..f065208ddfc1 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -101,7 +101,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.opendkim}/bin/opendkim ${concatMapStringsSep " " escapeShellArg args}"; + ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}"; User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index b7d14e90a2b7..c846ffd04551 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -152,8 +152,6 @@ let }; }; - mkShellStr = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - certtool = "${pkgs.gnutls.bin}/bin/certtool"; nixos-taskserver = pkgs.buildPythonPackage { diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 9868f303ab2b..8ecc16257db8 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -13,7 +13,7 @@ let ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; - dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps; + dumps = lib.escapeShellArgs cfg.loadDumps; in { |