Unverified Commit 238b952e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents dc4fceba 2c15aa59

ci/eval/compare.jq

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ def diff($before; $after): 
      elif .value <= 5000 then

        "2501-5000"

      else

        "5000+"

        "5001+"

      end

  )

)

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -19700,6 +19700,12 @@ 
    githubId = 2347889;

    name = "Sauyon Lee";

  };

  savalet = {

    email = "savinien.petitjean@gmail.com";

    github = "savalet";

    githubId = 73446695;

    name = "savalet";

  };

  savannidgerinel = {

    email = "savanni@luminescent-dreams.com";

    github = "savannidgerinel";

nixos/modules/services/continuous-integration/gitlab-runner.nix

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ let 
      touch ${configPath}



      # update global options

      remarshal --if toml --of json ${configPath} \

      remarshal --if toml --of json --stringify ${configPath} \

        | jq -cM 'with_entries(select([.key] | inside(["runners"])))' \

        | jq -scM '.[0] + .[1]' - <(echo ${escapeShellArg (toJSON cfg.settings)}) \

        | remarshal --if json --of toml \

nixos/modules/services/networking/netbird/coturn.nix

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ in 
              ${getExe pkgs.replace-secret} @password@ ${cfg.passwordFile} /run/coturn/turnserver.cfg

            '')

            + (optionalString cfg.useAcmeCertificates ''

              ${getExe pkgs.replace-secret} @cert@ "$CREDENTIALS_DIRECTORY/cert.pem" /run/coturn/turnserver.cfg

              ${getExe pkgs.replace-secret} @pkey@ "$CREDENTIALS_DIRECTORY/pkey.pem" /run/coturn/turnserver.cfg

              ${getExe pkgs.replace-secret} @cert@ <(echo -n "$CREDENTIALS_DIRECTORY/cert.pem") /run/coturn/turnserver.cfg

              ${getExe pkgs.replace-secret} @pkey@ <(echo -n "$CREDENTIALS_DIRECTORY/pkey.pem") /run/coturn/turnserver.cfg

            '');

        in

        (optionalAttrs (preStart' != "") { preStart = mkAfter preStart'; })

nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix

+3 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ in { 
        all kernel interfaces.

      '';



      start_action = mkEnumParam ["none" "trap" "start"] "none" ''

      start_action = mkEnumParam ["none" "trap" "start" "trap|start" ] "none" ''

        Action to perform after loading the configuration.



        - The default of `none` loads the connection only, which
@@ -1043,6 +1043,8 @@ in { 
        - The value `trap` installs a trap policy, which triggers

          the tunnel as soon as matching traffic has been detected.

        - The value `start` initiates the connection actively.

        - Since version 5.9.6 two modes above can be combined with `trap|start`,

          to immediately initiate a connection for which trap policies have been installed.



        When unloading or replacing a CHILD_SA configuration having a

        {option}`start_action` different from `none`,