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

Merge master into staging-next

parents da098201 e9b19524

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11330,6 +11330,13 @@ 
    githubId = 35086;

    name = "Jonathan Wright";

  };

  quantenzitrone = {

    email = "quantenzitrone@protonmail.com";

    github = "Quantenzitrone";

    githubId = 74491719;

    matrix = "@quantenzitrone:matrix.org";

    name = "quantenzitrone";

  };

  queezle = {

    email = "git@queezle.net";

    github = "queezle42";

nixos/doc/manual/configuration/user-mgmt.chapter.md

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ account will cease to exist. Also, imperative commands for managing users and 
groups, such as useradd, are no longer available. Passwords may still be

assigned by setting the user\'s

[hashedPassword](#opt-users.users._name_.hashedPassword) option. A

hashed password can be generated using `mkpasswd -m

  sha-512`.

hashed password can be generated using `mkpasswd`.



A user ID (uid) is assigned automatically. You can also specify a uid

manually by adding

nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ users.users.alice = { 
    Passwords may still be assigned by setting the user's

    <link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link>

    option. A hashed password can be generated using

    <literal>mkpasswd -m sha-512</literal>.

    <literal>mkpasswd</literal>.

  </para>

  <para>

    A user ID (uid) is assigned automatically. You can also specify a

nixos/modules/config/users-groups.nix

+21 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ let 
  '';



  hashedPasswordDescription = ''

    To generate a hashed password run `mkpasswd -m sha-512`.

    To generate a hashed password run `mkpasswd`.



    If set to an empty string (`""`), this user will

    be able to log in without being asked for a password (but not via remote
@@ -592,6 +592,26 @@ in { 
      '';

    };



    # Warn about user accounts with deprecated password hashing schemes

    system.activationScripts.hashes = {

      deps = [ "users" ];

      text = ''

        users=()

        while IFS=: read -r user hash tail; do

          if [[ "$hash" = "$"* && ! "$hash" =~ ^\$(y|gy|7|2b|2y|2a|6)\$ ]]; then

            users+=("$user")

          fi

        done </etc/shadow



        if (( "''${#users[@]}" )); then

          echo "

        WARNING: The following user accounts rely on password hashes that will

        be removed in NixOS 23.05. They should be renewed as soon as possible."

          printf ' - %s\n' "''${users[@]}"

        fi

      '';

    };



    # for backwards compatibility

    system.activationScripts.groups = stringAfter [ "users" ] "";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ 
  ./services/monitoring/teamviewer.nix

  ./services/monitoring/telegraf.nix

  ./services/monitoring/thanos.nix

  ./services/monitoring/tremor-rs.nix

  ./services/monitoring/tuptime.nix

  ./services/monitoring/unifi-poller.nix

  ./services/monitoring/ups.nix