ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

* added extraModules apache configuration option

Browse Source 
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
This commit is contained in:
Marc Weber 2008-04-27 23:56:51 +00:00
parent 228792a70d
commit 7a7582ec01
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/options.nix
View File

@ -1441,6 +1441,15 @@
";
};
extraModules = mkOption {
default = pkgs : [];
description = ''
used to add additional modules
Example for PHP:
pkgs : [ { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so" } ]
'';
};
logPerVirtualHost = mkOption {
default = false;
description = "

3
upstart-jobs/apache-httpd/default.nix
View File

@ -285,7 +285,8 @@ let
allModules =
concatMap (svc: svc.extraModulesPre) allSubservices ++
map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
concatMap (svc: svc.extraModules) allSubservices;
concatMap (svc: svc.extraModules) allSubservices ++
(pkgs.lib.getAttr ["extraModules"] (x:[]) mainCfg) pkgs;
in concatMapStrings load allModules
}