public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Lluís Batlle i Rossell 2016-04-07 11:37:19 +02:00
parent 4907fc9e8d
commit e1bcc27f1a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-servers/apache-httpd/trac.nix
View File

@ -5,14 +5,19 @@ with lib;
let let
# Build a Subversion instance with Apache modules and Swig/Python bindings. # Build a Subversion instance with Apache modules and Swig/Python bindings.
subversion = pkgs.subversion.override (origArgs: { subversion = pkgs.subversion.override {
bdbSupport = true; bdbSupport = true;
httpServer = true; httpServer = true;
pythonBindings = true; pythonBindings = true;
}); apacheHttpd = httpd;
};
pythonLib = p: "${p}/"; pythonLib = p: "${p}/";
httpd = serverInfo.serverConfig.package;
versionPre24 = versionOlder httpd.version "2.4";
in in
{ {
@ -82,7 +87,7 @@ in
AuthName "${config.ldapAuthentication.name}" AuthName "${config.ldapAuthentication.name}"
AuthBasicProvider "ldap" AuthBasicProvider "ldap"
AuthLDAPURL "${config.ldapAuthentication.url}" AuthLDAPURL "${config.ldapAuthentication.url}"
authzldapauthoritative Off ${if versionPre24 then "authzldapauthoritative Off" else ""}
require valid-user require valid-user
</LocationMatch> </LocationMatch>
'' else ""} '' else ""}