summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-04-27 12:47:13 +0200
committerlassulus <lass@aidsballs.de>2016-04-27 12:47:13 +0200
commit94fa4005d601ed07be8e23f2c9126573a07bf270 (patch)
tree47a67f455cabddfc14f1dc27a8393e2f4750ca3c /shared
parent64f493ccbf31f824d0c60821546644d6e0b3d842 (diff)
parent1241c61b8867b46a572605a69dd9b1fead65aa2b (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'shared')
-rw-r--r--shared/1systems/test-all-krebs-modules.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index 5c3ba9421..0084a7837 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -19,10 +19,11 @@ in {
username = "lol";
password = "wut";
};
- exim-retiolum = {
- enable = true;
- primary_hostname = "test.r";
- };
+ # XXX exim-retiolum and exim-smarthost are mutually exclusive
+ #exim-retiolum = {
+ # enable = true;
+ # primary_hostname = "test.r";
+ #};
exim-smarthost = {
enable = true;
primary_hostname = "test.r";