From 9e80ca48cb38dc1dd9fea45baad82fd9dd42b390 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 Oct 2009 14:36:54 +0000
Subject: [PATCH] added option to specify logformat to apache httpd, defaults
 to common (like it was until now)

svn path=/nixos/trunk/; revision=17923
---
 .../services/web-servers/apache-httpd/default.nix    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index d2cc288601a..9157aed3173 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -121,7 +121,7 @@ let
     LogFormat "%{Referer}i -> %U" referer
     LogFormat "%{User-agent}i" agent
 
-    CustomLog ${mainCfg.logDir}/access_log common
+    CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat}
   '';
 
 
@@ -218,7 +218,7 @@ let
 
     ${if !isMainServer && mainCfg.logPerVirtualHost then ''
       ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
-      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} common
+      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${mainCfg.logFormat}
     '' else ""}
 
     ${robotsConf}
@@ -429,6 +429,13 @@ in
         ";
       };
 
+      logFormat = mkOption {
+        default = "common";
+        description = "
+          Log format for Apache's log files. 
+        ";
+      };
+
       stateDir = mkOption {
         default = "/var/run/httpd";
         description = "
@@ -456,6 +463,7 @@ in
         '';
       };
 
+
       subservices = {
 
         # !!! remove this