Unverified Commit 2e1e1f87 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #231502 from SuperSandro2000/portunus-openldap 

nixos/portunus: use openldap compiled with libxcrypt-legacy
parents f704248a 00000006

nixos/modules/services/misc/portunus.nix

+3 −2
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ in 
    ldap = {

      package = mkOption {

        type = types.package;

        default = pkgs.openldap;

        defaultText = lib.literalExpression "pkgs.openldap";

        # needs openldap built with a libxcrypt that support crypt sha256 until https://github.com/majewsky/portunus/issues/2 is solved

        default = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; };

        defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }";

        description = lib.mdDoc "The OpenLDAP package to use.";

      };

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ in { 
  podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {};

  polaris = handleTest ./polaris.nix {};

  pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};

  portunus = handleTest ./portunus.nix { };

  postfix = handleTest ./postfix.nix {};

  postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};

  postfixadmin = handleTest ./postfixadmin.nix {};

nixos/tests/portunus.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ lib, ... }:



{

  name = "portunus";

  meta.maintainers = with lib.maintainers; [ SuperSandro2000 ];



  nodes.machine = _: {

    services.portunus = {

      enable = true;

      ldap.suffix = "dc=example,dc=org";

    };

  };



  testScript = ''

    machine.wait_for_unit("portunus.service")

    machine.succeed("curl --fail -vvv http://localhost:8080/")

  '';

})