From 7a7582ec01c4d78a3908a5d7963761479366b369 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 27 Apr 2008 23:56:51 +0000
Subject: [PATCH] * 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
---
 system/options.nix                    | 9 +++++++++
 upstart-jobs/apache-httpd/default.nix | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index b34249d8126..b8f378002f7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -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 = "
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index d2298987131..7d53706c60e 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -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
     }