svn path=/nixos/trunk/; revision=10781

system/options.nix

@@ -1194,6 +1194,16 @@
         ";
       };
 
+      logPerVirtualHost = mkOption {
+        default = false;
+        description = "
+          If enabled, each virtual host gets its own
+          <filename>access_log</filename> and
+          <filename>error_log</filename>, namely suffixed by the
+          <option>hostName</option> of the virtual host.
+        ";
+      };
+
       user = mkOption {
         default = "wwwrun";
         description = "

upstart-jobs/apache-httpd/default.nix

@@ -196,6 +196,11 @@ let
       ServerAdmin ${cfg.adminAddr}
     '' else ""}
 
+    ${if !isMainServer && mainCfg.logPerVirtualHost then ''
+      ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
+      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} common
+    '' else ""}
+
     ${robotsConf}
 
     ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}