diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
| commit | 400dab8254aa175213df8f6bd5ed391d80c7d827 (patch) | |
| tree | bcd035856f0a8da4a80cbbaa897f2605f57e11f8 /tv/3modules | |
| parent | 394408c9b715a2dfb6aba560c4db71b78cf46f8d (diff) | |
| parent | 95f1673f1f50384682815effa675e5ef5c68847e (diff) | |
Merge remote-tracking branch 'cd/master' into before-merge
Diffstat (limited to 'tv/3modules')
| -rw-r--r-- | tv/3modules/consul.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/ejabberd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/3modules/consul.nix b/tv/3modules/consul.nix index 82a15c024..e764ab7b2 100644 --- a/tv/3modules/consul.nix +++ b/tv/3modules/consul.nix @@ -29,7 +29,7 @@ let }; encrypt-file = mkOption { type = types.str; # TODO path (but not just into store) - default = "/root/src/secrets/consul-encrypt.json"; + default = toString <secrets/consul-encrypt.json>; }; data-dir = mkOption { type = types.str; # TODO path (but not just into store) diff --git a/tv/3modules/ejabberd.nix b/tv/3modules/ejabberd.nix index 2910a9a69..6b231fb56 100644 --- a/tv/3modules/ejabberd.nix +++ b/tv/3modules/ejabberd.nix @@ -15,7 +15,7 @@ let certFile = mkOption { type = types.str; - default = "/root/src/secrets/ejabberd.pem"; + default = toString <secrets/ejabberd.pem>; }; hosts = mkOption { |