From f7d2ccdb87a701490d83ce021058b09504a21050 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Aug 2007 15:19:27 +0000
Subject: [PATCH] Added mod_php option for httpd.

svn path=/nixos/trunk/; revision=9155
---
 system/options.nix     | 6 ++++++
 upstart-jobs/httpd.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 3130f6b5d5bb..8815a1a22090 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -783,6 +783,12 @@
 	directories and directory aliases defined by default.
 ";
   }
+
+  {
+    name = ["services" "httpd" "mod_php"];
+    default = false;
+    description = "Whether to enable php module.";
+  }
   
   {
     name = ["services" "httpd" "subservices" "subversion" "enable"];
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index eec1583293a3..080f34403734 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -29,6 +29,7 @@ let
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNewSetupScript;
+    php = if getCfg "mod_php" then pkgs.php else null;
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir