about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-04-06 06:23:48 +0200
committerGitHub <noreply@github.com>2019-04-06 06:23:48 +0200
commit82b8ff405bd151b682b9f5dfb14c672cb2b93866 (patch)
tree4f8eb70aaa8aa679dde965d17df82be8118a5966 /nixos
parent21d1b195c885f5bcef49f2d0485246ed8979f0a8 (diff)
parent01cec5155fdf8b3d9018331146664e615358728d (diff)
downloadnixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar.gz
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar.bz2
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar.lz
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar.xz
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.tar.zst
nixlib-82b8ff405bd151b682b9f5dfb14c672cb2b93866.zip
Merge pull request #58778 from aanderse/davmail
nixos/davmail: set logging default to warn, instead of debug
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/mail/davmail.nix32
1 files changed, 20 insertions, 12 deletions
diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix
index a0cb81f84dac..5b5cc294e5c7 100644
--- a/nixos/modules/services/mail/davmail.nix
+++ b/nixos/modules/services/mail/davmail.nix
@@ -58,18 +58,26 @@ in
 
     config = mkIf cfg.enable {
 
-      services.davmail.config.davmail = mapAttrs (name: mkDefault) {
-        server = true;
-        disableUpdateCheck = true;
-        logFilePath = "/var/log/davmail/davmail.log";
-        logFileSize = "1MB";
-        mode = "auto";
-        url = cfg.url;
-        caldavPort = 1080;
-        imapPort = 1143;
-        ldapPort = 1389;
-        popPort = 1110;
-        smtpPort = 1025;
+      services.davmail.config = {
+        davmail = mapAttrs (name: mkDefault) {
+          server = true;
+          disableUpdateCheck = true;
+          logFilePath = "/var/log/davmail/davmail.log";
+          logFileSize = "1MB";
+          mode = "auto";
+          url = cfg.url;
+          caldavPort = 1080;
+          imapPort = 1143;
+          ldapPort = 1389;
+          popPort = 1110;
+          smtpPort = 1025;
+        };
+        log4j = {
+          logger.davmail = mkDefault "WARN";
+          logger.httpclient.wire = mkDefault "WARN";
+          logger.org.apache.commons.httpclient = mkDefault "WARN";
+          rootLogger = mkDefault "WARN";
+        };
       };
 
       systemd.services.davmail = {