* added extraModules apache configuration option
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:
parent
228792a70d
commit
7a7582ec01
|
@ -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 {
|
logPerVirtualHost = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
description = "
|
description = "
|
||||||
|
|
|
@ -285,7 +285,8 @@ let
|
||||||
allModules =
|
allModules =
|
||||||
concatMap (svc: svc.extraModulesPre) allSubservices ++
|
concatMap (svc: svc.extraModulesPre) allSubservices ++
|
||||||
map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
|
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
|
in concatMapStrings load allModules
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue