Unverified Commit f300ddee authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents e0f59563 162dfd32

nixos/modules/services/hardware/rasdaemon.nix

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ let 


in

{

  meta = {

    inherit (pkgs.rasdaemon.meta) maintainers;

  };



  options.hardware.rasdaemon = {



    enable = lib.mkEnableOption "RAS logging daemon";

nixos/tests/alps.nix

+41 −32
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ in 
  };



  nodes = {

    server = {

    server =

      { config, ... }:

      {

        imports = [ ./common/user-account.nix ];

        security.pki.certificateFiles = [

          certs.ca.cert
@@ -38,10 +40,17 @@ in 
        };

        services.dovecot2 = {

          enable = true;

        enableImap = true;

        sslCACert = "${certs.ca.cert}";

        sslServerCert = "${certs.${domain}.cert}";

        sslServerKey = "${certs.${domain}.key}";

          enablePAM = true;

          settings = {

            dovecot_config_version = "2.4.3";

            dovecot_storage_version = config.services.dovecot2.package.version;

            mail_driver = "maildir";

            mail_path = "~/mail";

            protocols.imap = true;

            ssl_server_ca_file = "${certs.ca.cert}";

            ssl_server_cert_file = "${certs.${domain}.cert}";

            ssl_server_key_file = "${certs.${domain}.key}";

          };

        };

      };
@@ -110,7 +119,7 @@ in 
    ''

      server.start()

      server.wait_for_unit("postfix.service")

      server.wait_for_unit("dovecot2.service")

      server.wait_for_unit("dovecot.service")

      server.wait_for_open_port(465)

      server.wait_for_open_port(993)

nixos/tests/discourse.nix

+9 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ in 
    };



  nodes.client =

    { nodes, ... }:

    { config, nodes, ... }:

    {

      imports = [ common/user-account.nix ];
@@ -100,7 +100,14 @@ in 


      services.dovecot2 = {

        enable = true;

        protocols = [ "imap" ];

        enablePAM = true;

        settings = {

          dovecot_config_version = "2.4.3";

          dovecot_storage_version = config.services.dovecot2.package.version;

          protocols.imap = true;

          mail_driver = "maildir";

          mail_path = "${config.services.postfix.settings.main.mail_spool_directory}/%{user}";

        };

      };



      services.postfix = {

nixos/tests/opensmtpd.nix

+11 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import ./make-test-python.nix { 
      };



    smtp2 =

      { pkgs, ... }:

      { config, pkgs, ... }:

      {

        imports = [ common/user-account.nix ];

        networking = {
@@ -71,15 +71,21 @@ import ./make-test-python.nix { 
          serverConfiguration = ''

            listen on 0.0.0.0

            action dovecot_deliver mda \

              "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"

              "${config.services.dovecot2.package}/libexec/dovecot/deliver -d %{user.username}"

            match from any for local action dovecot_deliver

          '';

        };

        services.dovecot2 = {

          enable = true;

          enableImap = true;

          mailLocation = "maildir:~/mail";

          protocols = [ "imap" ];

          enablePAM = true;

          settings = {

            dovecot_config_version = "2.4.3";

            dovecot_storage_version = config.services.dovecot2.package.version;

            mail_driver = "maildir";

            mail_path = "~/mail";

            protocols.imap = true;

            auth_allow_cleartext = true;

          };

        };

      };

nixos/tests/rasdaemon.nix

+2 −3
Original line number Diff line number Diff line 
{ ... }:

{ pkgs, ... }:

{

  name = "rasdaemon";

  meta = {

    maintainers = [ ];

    broken = true; # test timed out

    inherit (pkgs.rasdaemon.meta) maintainers;

  };



  nodes.machine =