Merge pull request #3230 from robberer/module/httpd

httpd: disable logging when logFormat = "none"
2014-08-23 11:37:48 +04:00 · 2014-08-23 11:37:48 +04:00 · c0da615c02
parent 38d9a1cf0e cab929c6c2
commit c0da615c02
1 changed files with 4 additions and 2 deletions
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@ -130,7 +130,7 @@ let
  '';


-  loggingConf = ''
+  loggingConf = (if mainCfg.logFormat != "none" then ''
    ErrorLog ${mainCfg.logDir}/error_log

    LogLevel notice
@ -141,7 +141,9 @@ let
    LogFormat "%{User-agent}i" agent

    CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat}
-  '';
+  '' else ''
+    ErrorLog /dev/null
+  '');


  browserHacks = ''