Unverified Commit a3053c44 authored by Naïm Favier's avatar Naïm Favier
Browse files

Merge branch 'master' into haskell-updates

parents 8e92eb96 a9842e25

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -22140,6 +22140,12 @@ 
    githubId = 474343;

    name = "Xavier Zwirtz";

  };

  XBagon = {

    name = "XBagon";

    email = "xbagon@outlook.de";

    github = "XBagon";

    githubId = 1523292;

  };

  xbreak = {

    email = "xbreak@alphaware.se";

    github = "xbreak";

nixos/doc/manual/release-notes/rl-2405.section.md

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.

- `k3s`: has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) and present to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information.



- `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.

nixos/modules/services/monitoring/loki.nix

+7 −2
Original line number Diff line number Diff line
@@ -97,7 +97,12 @@ in { 


      serviceConfig = let

        conf = if cfg.configFile == null

               then prettyJSON cfg.configuration

               then

                 # Config validation may fail when using extraFlags = [ "-config.expand-env=true" ].

                 # To work around this, we simply skip it when extraFlags is not empty.

                 if cfg.extraFlags == []

                 then validateConfig (prettyJSON cfg.configuration)

                 else prettyJSON cfg.configuration

               else cfg.configFile;

        validateConfig = file:

        pkgs.runCommand "validate-loki-conf" {
@@ -108,7 +113,7 @@ in { 
          '';

      in

      {

        ExecStart = "${cfg.package}/bin/loki --config.file=${validateConfig conf} ${escapeShellArgs cfg.extraFlags}";

        ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";

        User = cfg.user;

        Restart = "always";

        PrivateTmp = true;

nixos/modules/services/networking/rosenpass.nix

+4 −2
Original line number Diff line number Diff line
@@ -225,8 +225,10 @@ in 
        # See <https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers>

        environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml";



        preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\"";

        script = "rosenpass exchange-config \"$CONFIG\"";

        script = ''

          ${getExe pkgs.envsubst} -i ${config} -o "$CONFIG"

          rosenpass exchange-config "$CONFIG"

        '';

      };

  };

}

nixos/tests/step-ca.nix

+23 −0
Original line number Diff line number Diff line
@@ -62,6 +62,24 @@ import ./make-test-python.nix ({ pkgs, ... }: 
            };

          };



        caclientcaddy =

          { config, pkgs, ... }: {

            security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];



            networking.firewall.allowedTCPPorts = [ 80 443 ];



            services.caddy = {

              enable = true;

              virtualHosts."caclientcaddy".extraConfig = ''

                respond "Welcome to Caddy!"



                tls caddy@example.org {

                  ca https://caserver:8443/acme/acme/directory

                }

              '';

            };

          };



        catester = { config, pkgs, ... }: {

          security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];

        };
@@ -71,7 +89,12 @@ import ./make-test-python.nix ({ pkgs, ... }: 
      ''

        catester.start()

        caserver.wait_for_unit("step-ca.service")

        caserver.succeed("journalctl -o cat -u step-ca.service | grep '${pkgs.step-ca.version}'")



        caclient.wait_for_unit("acme-finished-caclient.target")

        catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")



        caclientcaddy.wait_for_unit("caddy.service")

        catester.succeed("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"")

      '';

  })