From ac764394050f6fc39e406799085259d3fc08956a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 21 May 2015 22:33:16 +0200
Subject: next: initial commit

---
 modules/cd/default.nix  | 2 +-
 modules/tv/ejabberd.nix | 4 ++--
 modules/wu/users.nix    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 3ee370443..7ceaf71f3 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 e836d2cdd..008fe2cda 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 654d49cef..88f2b658e 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";
-- 
cgit v1.2.3