public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move logFormat to the per-vhost options. 

svn path=/nixos/trunk/; revision=34066
This commit is contained in:
Eelco Dolstra 2012-05-11 23:14:05 +00:00
parent 5167f5abef
commit ce3941d6e6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/services/web-servers/apache-httpd/default.nix
View File

@ -220,7 +220,7 @@ let
${if !isMainServer && mainCfg.logPerVirtualHost then '' ${if !isMainServer && mainCfg.logPerVirtualHost then ''
ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName} ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${mainCfg.logFormat} CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat}
'' else ""} '' else ""}
${robotsConf} ${robotsConf}
@ -447,14 +447,6 @@ in
"; ";
}; };
logFormat = mkOption {
default = "common";
example = "combined";
description = "
Log format for Apache's log files. Possible values are: combined, common, referer, agent.
";
};
stateDir = mkOption { stateDir = mkOption {
default = "/var/run/httpd"; default = "/var/run/httpd";
description = " description = "

8
modules/services/web-servers/apache-httpd/per-server-options.nix
View File

@ -135,4 +135,12 @@
"; ";
}; };
logFormat = mkOption {
default = "common";
example = "combined";
description = "
Log format for Apache's log files. Possible values are: combined, common, referer, agent.
";
};
} }