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

Merge master into staging-next

parents 3ed8e14f cd64f1bd

nixos/lib/testing/network.nix

+11 −12
Original line number Diff line number Diff line
@@ -3,15 +3,15 @@ 
let

  inherit (lib)

    attrNames

    concatMap

    concatMapAttrs

    concatMapStrings

    flip

    forEach

    head

    listToAttrs

    mkDefault

    mkOption

    nameValuePair

    optionalAttrs

    optionalString

    range

    toLower
@@ -91,23 +91,22 @@ let 
        # interfaces, use the IP address corresponding to

        # the first interface (i.e. the first network in its

        # virtualisation.vlans option).

        networking.extraHosts = flip concatMapStrings (attrNames nodes) (

          m':

        networking.hosts = concatMapAttrs (

          name: config:

          let

            config = nodes.${m'};

            hostnames =

              optionalString (

                config.networking.domain != null

              ) "${config.networking.hostName}.${config.networking.domain} "

              + "${config.networking.hostName}\n";

          in

          optionalString (

            config.networking.primaryIPAddress != ""

          ) "${config.networking.primaryIPAddress} ${hostnames}"

          + optionalString (config.networking.primaryIPv6Address != "") (

            "${config.networking.primaryIPv6Address} ${hostnames}"

          )

        );

          optionalAttrs (config.networking.primaryIPAddress != "") {

            "${config.networking.primaryIPAddress}" = [ hostnames ];

          }

          // optionalAttrs (config.networking.primaryIPv6Address != "") {

            "${config.networking.primaryIPv6Address}" = [ hostnames ];

          }

        ) nodes;



        virtualisation.qemu.options = qemuOptions;

        boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules;

nixos/modules/services/cluster/kubernetes/pki.nix

+6 −3
Original line number Diff line number Diff line
@@ -365,9 +365,12 @@ in 
        keyFile = mkDefault key;

        trustedCaFile = mkDefault caCert;

      };

      networking.extraHosts = mkIf (config.services.etcd.enable) ''

        127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local

      '';

      networking.hosts = mkIf (config.services.etcd.enable) {

        "127.0.0.1" = [

          "etcd.${top.addons.dns.clusterDomain}"

          "etcd.local"

        ];

      };



      services.flannel = with cfg.certs.flannelClient; {

        kubeconfig = top.lib.mkKubeConfig "flannel" {

nixos/modules/services/continuous-integration/jenkins/default.nix

+5 −9
Original line number Diff line number Diff line
@@ -11,13 +11,7 @@ in 
{

  options = {

    services.jenkins = {

      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Whether to enable the jenkins continuous integration server.

        '';

      };

      enable = lib.mkEnableOption "Jenkins, a continuous integration server";



      user = lib.mkOption {

        default = "jenkins";
@@ -89,11 +83,13 @@ in 


      package = lib.mkPackageOption pkgs "jenkins" { };



      javaPackage = lib.mkPackageOption pkgs "jdk21" { };



      packages = lib.mkOption {

        default = [

          pkgs.stdenv

          pkgs.git

          pkgs.jdk17

          pkgs.jdk21

          config.programs.ssh.package

          pkgs.nix

        ];
@@ -239,7 +235,7 @@ in 


      # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript

      script = ''

        ${pkgs.jdk17}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \

        ${cfg.javaPackage}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \

                                                  --httpPort=${toString cfg.port} \

                                                  --prefix=${cfg.prefix} \

                                                  -Djava.awt.headless=true \

nixos/modules/services/web-apps/lasuite-docs.nix

+7 −0
Original line number Diff line number Diff line
@@ -176,6 +176,13 @@ in 
              defaultText = lib.literalExpression "https://\${cfg.domain}";

              description = "URL to the backend server base";

            };



            COLLABORATION_SERVER_ORIGIN = mkOption {

              type = types.str;

              default = "https://${cfg.domain}";

              defaultText = lib.literalExpression "https://\${cfg.domain}";

              description = "Origins allowed to connect to the collaboration server";

            };

          };

        };

        default = { };

nixos/modules/virtualisation/google-compute-config.nix

+6 −4
Original line number Diff line number Diff line
@@ -70,10 +70,12 @@ in 
  # Rely on GCP's firewall instead

  networking.firewall.enable = mkDefault false;



  # Configure default metadata hostnames

  networking.extraHosts = ''

    169.254.169.254 metadata.google.internal metadata

  '';

  networking.hosts = {

    "169.254.169.254" = [

      "metadata.google.internal"

      "metadata"

    ];

  };



  networking.timeServers = [ "metadata.google.internal" ];