From ddd05772b5de242fc7ea2569779ffc5d37ec3443 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Thu, 2 Mar 2017 17:17:56 +0300 Subject: BREAKING: changed key names semantics "foo[bar]" becomes "foo@bar". Key names must be very carefully chosen due to different requirements from file system, systemd, etc. See https://github.com/NixOS/nixops/issues/614 --- modules/deployment/keyrings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/deployment/keyrings.nix') diff --git a/modules/deployment/keyrings.nix b/modules/deployment/keyrings.nix index e5d0110..9325bf7 100644 --- a/modules/deployment/keyrings.nix +++ b/modules/deployment/keyrings.nix @@ -17,7 +17,7 @@ let # error: the contents of the file ‘...’ cannot be represented as a Nix string read = key: let - m = match "^([^(]*)\\[.+\\]$" key; + m = match "^(.+)@[^@]+$" key; s = if m != null then head m else key; in if cfg.secrets != null then readFile (cfg.secrets + "/${s}") -- cgit v1.2.3