commit 2e1e1f8765e892b4b64fcf7473e72e411a13e6b9 · pyrox.dev/nixpkgs

+3 -2

nixos/modules/services/misc/portunus.nix

···

       107
       107
        
           ldap = {

     

       108
       108
        
             package = mkOption {

     

       109
       109
        
               type = types.package;

     

       110
       110
       -
               default = pkgs.openldap;

     

       111
       111
       -
               defaultText = lib.literalExpression "pkgs.openldap";

     

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

     

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

     

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

     

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

     

       113
       114
        
             };

     

       114
       115

+1

nixos/tests/all-tests.nix

···

       603
       603
        
         podman-tls-ghostunnel = handleTestOn ["aarch64-linux" "x86_64-linux"] ./podman/tls-ghostunnel.nix {};

     

       604
       604
        
         polaris = handleTest ./polaris.nix {};

     

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

     

       606
       606
       +
         portunus = handleTest ./portunus.nix { };

     

       606
       607
        
         postfix = handleTest ./postfix.nix {};

     

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

     

       608
       609
        
         postfixadmin = handleTest ./postfixadmin.nix {};

+18

nixos/tests/portunus.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "portunus";

     

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

     

       6
       6
       +
       

     

       7
       7
       +
         nodes.machine = _: {

     

       8
       8
       +
           services.portunus = {

     

       9
       9
       +
             enable = true;

     

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

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         testScript = ''

     

       15
       15
       +
           machine.wait_for_unit("portunus.service")

     

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

     

       17
       17
       +
         '';

     

       18
       18
       +
       })