Merge remote-tracking branch 'orange/master'

3 files changed, 7 insertions, 4 deletions

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 28ce09941..5d12ea7af 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -1,7 +1,6 @@
 { config, lib, ... }:
 {
   imports = [
-    ../../kartei
     ./acl.nix
     ./airdcpp.nix
     ./announce-activation.nix
@@ -28,9 +27,10 @@
     ./iana-etc.nix
     ./iptables.nix
     ./kapacitor.nix
+    ./kartei.nix
     ./konsens.nix
-    ./krebs.nix
     ./krebs-pages.nix
+    ./krebs.nix
     ./monit.nix
     ./nixpkgs.nix
     ./on-failure.nix
@@ -45,8 +45,8 @@
     ./secret.nix
     ./setuid.nix
     ./shadow.nix
-    ./ssh.nix
     ./sitemap.nix
+    ./ssh.nix
     ./ssl.nix
     ./sync-containers.nix
     ./sync-containers3.nix
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index 7b3dace6a..093ae2030 100644
--- a/krebs/3modules/exim-smarthost.nix
+++ b/krebs/3modules/exim-smarthost.nix
@@ -40,7 +40,7 @@ let
     };
 
     extraRouters = mkOption {
-      type = types.nullOr types.str;
+      type = types.nullOr types.lines;
       default = null;
     };
 
diff --git a/krebs/3modules/kartei.nix b/krebs/3modules/kartei.nix
new file mode 100644
index 000000000..3dcb65ff6
--- /dev/null
+++ b/krebs/3modules/kartei.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ../../kartei ];
+}