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 '' else ""}