diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2016-04-07 11:37:19 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-04-07 11:40:22 +0200 |
commit | e1bcc27f1aaba77d4b8263250f5a95199fa36453 (patch) | |
tree | ba8cc5b01c5c9f83b499b4f173be5bd509e26f24 | |
parent | 4907fc9e8d0d82b28b3c56e3a478a2882f1d700f (diff) | |
download | nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar.gz nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar.bz2 nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar.lz nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar.xz nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.tar.zst nixlib-e1bcc27f1aaba77d4b8263250f5a95199fa36453.zip |
Making trac/ldap handle httpd 2.4.
The option authzldapauthoritative had been removed in 2.4 I pushed this into 16.03 instead of master first. My fault. (cherry picked from commit 516f47efefc44a5465266fe4d72f9136147d2caf)
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/trac.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index 8fe8b90d823c..c5c11029010e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/trac.nix +++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix @@ -5,14 +5,19 @@ with lib; let # Build a Subversion instance with Apache modules and Swig/Python bindings. - subversion = pkgs.subversion.override (origArgs: { + subversion = pkgs.subversion.override { bdbSupport = true; httpServer = true; pythonBindings = true; - }); + apacheHttpd = httpd; + }; pythonLib = p: "${p}/"; + httpd = serverInfo.serverConfig.package; + + versionPre24 = versionOlder httpd.version "2.4"; + in { @@ -82,7 +87,7 @@ in AuthName "${config.ldapAuthentication.name}" AuthBasicProvider "ldap" AuthLDAPURL "${config.ldapAuthentication.url}" - authzldapauthoritative Off + ${if versionPre24 then "authzldapauthoritative Off" else ""} require valid-user </LocationMatch> '' else ""} |