Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

nixos/modules/services/web-servers/apache-httpd/default.nix

@@ -387,7 +387,7 @@ let
   '';
 
 
-  enablePHP = any (svc: svc.enablePHP) allSubservices;
+  enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices;
 
 
   # Generate the PHP configuration file.  Should probably be factored
@@ -531,6 +531,12 @@ in
         '';
       };
 
+      enablePHP = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the PHP module.";
+      };
+
       phpOptions = mkOption {
         type = types.lines;
         default = "";

nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix

@@ -29,6 +29,14 @@ ${extraWorkersProperties}
   '';
 in
 {
+
+  options = {
+    extraWorkersProperties = lib.mkOption {
+      default = "";
+      description = "Additional configuration for the workers.properties file.";
+    };
+  };
+
   extraModules = [
     { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; }
   ];