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

Merge master into staging-next

parents ef4dd61b 1dd55694

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ in mkLicense lset) ({ 
    fullName = "Creative Commons Attribution 1.0";

  };



  cc-by-20 = {

    spdxId = "CC-BY-2.0";

    fullName = "Creative Commons Attribution 2.0";

  };



  cc-by-30 = {

    spdxId = "CC-BY-3.0";

    fullName = "Creative Commons Attribution 3.0";

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -11231,6 +11231,15 @@ 
    githubId = 42545625;

    name = "Maas Lalani";

  };

  mabster314 = {

    name = "Max Haland";

    email = "max@haland.org";

    github = "mabster314";

    githubId = 5741741;

    keys = [{

      fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8";

    }];

  };

  macalinao = {

    email = "me@ianm.com";

    name = "Ian Macalinao";

nixos/modules/services/hardware/ratbagd.nix

+5 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ in 
  options = {

    services.ratbagd = {

      enable = mkEnableOption (lib.mdDoc "ratbagd for configuring gaming mice");



      package = mkPackageOption pkgs "libratbag" { };

    };

  };
@@ -18,10 +20,10 @@ in 


  config = mkIf cfg.enable {

    # Give users access to the "ratbagctl" tool

    environment.systemPackages = [ pkgs.libratbag ];

    environment.systemPackages = [ cfg.package ];



    services.dbus.packages = [ pkgs.libratbag ];

    services.dbus.packages = [ cfg.package ];



    systemd.packages = [ pkgs.libratbag ];

    systemd.packages = [ cfg.package ];

  };

}

nixos/modules/services/misc/portunus.nix

+54 −41
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ in 
      '';

    };



    seedSettings = lib.mkOption {

      type = with lib.types; nullOr (attrsOf (listOf (attrsOf anything)));

      default = null;

      description = lib.mdDoc ''

        Seed settings for users and groups.

        See upstream for format <https://github.com/majewsky/portunus#seeding-users-and-groups-from-static-configuration>

      '';

    };



    stateDir = mkOption {

      type = types.path;

      default = "/var/lib/portunus";
@@ -172,7 +181,8 @@ in 
      "127.0.0.1" = [ cfg.domain ];

    };



    services.dex = mkIf cfg.dex.enable {

    services = {

      dex = mkIf cfg.dex.enable {

        enable = true;

        settings = {

          issuer = "https://${cfg.domain}/dex";
@@ -217,6 +227,9 @@ in 
        };

      };



      portunus.seedPath = lib.mkIf (cfg.seedSettings != null) (pkgs.writeText "seed.json" (builtins.toJSON cfg.seedSettings));

    };



    systemd.services = {

      dex.serviceConfig = mkIf cfg.dex.enable {

        # `dex.service` is super locked down out of the box, but we need some

nixos/tests/pomerium.nix

+2 −2
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, lib, ... }: {

  name = "pomerium";

  meta = with lib.maintainers; {

    maintainers = [ lukegb ];

    maintainers = [ lukegb devusb ];

  };



  nodes = let base = myIP: { pkgs, lib, ... }: {
@@ -103,7 +103,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
    with subtest("ui"):

        pomerium.succeed(

          # check for a string that only appears if the UI is displayed correctly

            "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'contact your administrator'"

            "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'User Details Not Available'"

        )

  '';

})