diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-12 23:38:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 23:38:57 +0100 |
| commit | a95229a963ce35341347d00406c7b8102a42e59f (patch) | |
| tree | 6d448f21e0a1258f53add3a19959663c942702ee /nixos/modules/services | |
| parent | ecdd2721da9d0e1614a0c3f0aa76cbf78613a744 (diff) | |
| parent | 25fbac5b52f80b43c778e16e906f2d5223412707 (diff) | |
| download | nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar.gz nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar.bz2 nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar.lz nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar.xz nixlib-a95229a963ce35341347d00406c7b8102a42e59f.tar.zst nixlib-a95229a963ce35341347d00406c7b8102a42e59f.zip | |
Merge pull request #15677 from womfoo/mod_auth_mellon
mod_auth_mellon: init at 0.12.0 and dependency lasso: init at 2.5.1
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index c23897192b4c..9844e3c435d1 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -337,6 +337,7 @@ let allModules = concatMap (svc: svc.extraModulesPre) allSubservices ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules + ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } ++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; @@ -541,6 +542,12 @@ in ''; }; + enableMellon = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the mod_auth_mellon module."; + }; + enablePHP = mkOption { type = types.bool; default = false; @@ -650,6 +657,7 @@ in environment = optionalAttrs enablePHP { PHPRC = phpIni; } + // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); preStart = |