summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-07-25 20:39:35 +0200
committertv <tv@krebsco.de>2023-07-25 20:39:35 +0200
commit5d1b0675cf179f863a5b34b67661a953197b6057 (patch)
treedd9c83dff894fd97cee61dd1b2df3eaeecbbd740 /krebs/3modules
parenta2c9ad05b2e8237b915a100e1e38ca0f3d18526c (diff)
parent8eab63eaa81717391269a61355cb7fb64341fd1a (diff)
Merge remote-tracking branch 'orange/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix6
-rw-r--r--krebs/3modules/exim-smarthost.nix2
-rw-r--r--krebs/3modules/kartei.nix3
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 ];
+}