summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-05-21 22:33:16 +0200
committertv <tv@shackspace.de>2015-05-21 22:33:16 +0200
commitac764394050f6fc39e406799085259d3fc08956a (patch)
treec5deade7085a8e63ef36a72afea58e09593c096a /modules
parentb27ec1aafa813740941d9194f1e7e113d5de8244 (diff)
next: initial commit
Diffstat (limited to 'modules')
-rw-r--r--modules/cd/default.nix2
-rw-r--r--modules/tv/ejabberd.nix4
-rw-r--r--modules/wu/users.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 3ee37044..7ceaf71f 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -3,7 +3,7 @@
{
imports =
[
- <secrets/cd.hashedPasswords.nix>
+ <secrets/hashedPasswords.nix>
./iptables.nix
./networking.nix
../common/nixpkgs.nix
diff --git a/modules/tv/ejabberd.nix b/modules/tv/ejabberd.nix
index e836d2cd..008fe2cd 100644
--- a/modules/tv/ejabberd.nix
+++ b/modules/tv/ejabberd.nix
@@ -221,7 +221,7 @@ in
%% file and uncomment this line:
%%
starttls,
- {certfile, "/etc/nixos/secrets/ejabberd.cd.retiolum.pem"},
+ {certfile, "/etc/ejabberd/ejabberd.pem"},
{access, c2s},
{shaper, c2s_shaper},
@@ -274,7 +274,7 @@ in
%%
%% s2s_certfile: Specify a certificate file.
%%
- {s2s_certfile, "/etc/nixos/secrets/ejabberd.cd.retiolum.pem"}.
+ {s2s_certfile, "/etc/ejabberd/ejabberd.pem"}.
%%
%% domain_certfile: Specify a different certificate for each served hostname.
diff --git a/modules/wu/users.nix b/modules/wu/users.nix
index 654d49ce..88f2b658 100644
--- a/modules/wu/users.nix
+++ b/modules/wu/users.nix
@@ -210,7 +210,7 @@ in
{
imports = [
- <secrets/wu.hashedPasswords.nix>
+ <secrets/hashedPasswords.nix>
];
users.defaultUserShell = "/run/current-system/sw/bin/bash";