diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-27 19:41:01 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-27 19:41:01 +0200 |
| commit | bc2bd6e2f6e9295b14e641b82bff62b40641988d (patch) | |
| tree | 8bc4b655c12b4e0bc33051116a3adb3003463d34 /tv/3modules | |
| parent | c65614cdef66c38ff2939928e9072873e19e1c37 (diff) | |
| parent | 170191034e51fb7e80ff6e6ddcac103ec7527afd (diff) | |
Merge branch '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 { |