summary refs log tree commit diff
path: root/nixos/modules/services/web-servers/apache-httpd/default.nix
diff options
context:
space:
mode:
authorSystem administrator <robberer@freakmail.de>2014-07-10 14:32:08 +0200
committerSystem administrator <robberer@freakmail.de>2014-07-10 14:32:08 +0200
commitcab929c6c25d69012dc9d161b0068a5c3bf26718 (patch)
tree55769dd5b541b963d6df93c7a24861b7005ff0fa /nixos/modules/services/web-servers/apache-httpd/default.nix
parentf5756aa3bb3130053c943129097755d0c1219634 (diff)
downloadnixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar.gz
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar.bz2
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar.lz
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar.xz
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.tar.zst
nixlib-cab929c6c25d69012dc9d161b0068a5c3bf26718.zip
httpd: disable logging when logFormat = "none"
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/default.nix')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6d0416fbb155..b1a247163a47 100644
--- 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 = ''