cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #183361 from olafklingt/jane2alice

Browse source 
use consistently user alice for examples
This commit is contained in:
Robert Hensing 2022-08-05 15:28:03 +02:00 committed by GitHub
commit c5abcd4270
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/doc/manual/configuration/gpu-accel.chapter.md
View file

@ -169,7 +169,7 @@ configuration, GPU devices have world-read/write permissions
(`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The (`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The
access control lists of devices with the `uaccess` tag will be updated access control lists of devices with the `uaccess` tag will be updated
automatically when a user logs in through `systemd-logind`. For example, automatically when a user logs in through `systemd-logind`. For example,
if the user *jane* is logged in, the access control list should look as if the user *alice* is logged in, the access control list should look as
follows: follows:
```ShellSession ```ShellSession
@ -178,7 +178,7 @@ $ getfacl /dev/dri/card0
# owner: root # owner: root
# group: video # group: video
user::rw- user::rw-
user:jane:rw- user:alice:rw-
group::rw- group::rw-
mask::rw- mask::rw-
other::--- other::---

4
nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml
View file

@ -194,7 +194,7 @@ environment.variables.VK_ICD_FILENAMES =
devices with the <literal>uaccess</literal> tag will be updated devices with the <literal>uaccess</literal> tag will be updated
automatically when a user logs in through automatically when a user logs in through
<literal>systemd-logind</literal>. For example, if the user <literal>systemd-logind</literal>. For example, if the user
<emphasis>jane</emphasis> is logged in, the access control list <emphasis>alice</emphasis> is logged in, the access control list
should look as follows: should look as follows:
</para> </para>
<programlisting> <programlisting>
@ -203,7 +203,7 @@ $ getfacl /dev/dri/card0
# owner: root # owner: root
# group: video # group: video
user::rw- user::rw-
user:jane:rw- user:alice:rw-
group::rw- group::rw-
mask::rw- mask::rw-
other::--- other::---

2
nixos/maintainers/scripts/lxd/lxd-image-inner.nix
View file

@ -55,7 +55,7 @@ with lib;
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.jane = { # users.users.alice = {
# isNormalUser = true; # isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# }; # };

2
nixos/modules/installer/tools/tools.nix
View file

@ -175,7 +175,7 @@ in
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.jane = { # users.users.alice = {
# isNormalUser = true; # isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# packages = with pkgs; [ # packages = with pkgs; [

2
nixos/modules/services/games/crossfire-server.nix
View file

@ -76,7 +76,7 @@ in {
{ {
dm_file = ''' dm_file = '''
admin:secret_password:localhost admin:secret_password:localhost
jane:xyzzy:* alice:xyzzy:*
'''; ''';
ban_file = ''' ban_file = '''
# Bob is a jerk # Bob is a jerk

2
nixos/modules/services/games/deliantra-server.nix
View file

@ -73,7 +73,7 @@ in {
{ {
dm_file = ''' dm_file = '''
admin:secret_password:localhost admin:secret_password:localhost
jane:xyzzy:* alice:xyzzy:*
'''; ''';
motd = "Welcome to Deliantra!"; motd = "Welcome to Deliantra!";
settings = ''' settings = '''

2
nixos/modules/services/networking/smokeping.nix
View file

@ -156,7 +156,7 @@ in
owner = mkOption { owner = mkOption {
type = types.str; type = types.str;
default = "nobody"; default = "nobody";
example = "Joe Admin"; example = "Bob Foobawr";
description = lib.mdDoc "Real name of the owner of the instance"; description = lib.mdDoc "Real name of the owner of the instance";
}; };
ownerEmail = mkOption { ownerEmail = mkOption {

4
nixos/tests/docker-tools.nix
View file

@ -346,7 +346,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker load --input='${examples.layeredImageWithFakeRootCommands}'" "docker load --input='${examples.layeredImageWithFakeRootCommands}'"
) )
docker.succeed( docker.succeed(
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'"
) )
with subtest("Ensure docker load on merged images loads all of the constituent images"): with subtest("Ensure docker load on merged images loads all of the constituent images"):
@ -389,7 +389,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker load --input='${examples.mergedBashFakeRoot}'" "docker load --input='${examples.mergedBashFakeRoot}'"
) )
docker.succeed( docker.succeed(
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'"
) )
with subtest("The image contains store paths referenced by the fakeRootCommands output"): with subtest("The image contains store paths referenced by the fakeRootCommands output"):

6
nixos/tests/documize.nix
View file

@ -47,9 +47,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
" --data 'dbhash={}'" " --data 'dbhash={}'"
" --data 'title=NixOS'" " --data 'title=NixOS'"
" --data 'message=Docs'" " --data 'message=Docs'"
" --data 'firstname=John'" " --data 'firstname=Bob'"
" --data 'lastname=Doe'" " --data 'lastname=Foobar'"
" --data 'email=john.doe@nixos.org'" " --data 'email=bob.foobar@nixos.org'"
" --data 'password=verysafe'" " --data 'password=verysafe'"
" -f localhost:3000/api/setup" " -f localhost:3000/api/setup"
).format(dbhash) ).format(dbhash)

8
nixos/tests/nginx-auth.nix
View file

@ -13,14 +13,14 @@ import ./make-test-python.nix ({ pkgs, ... }: {
virtualHosts.lockedroot = { virtualHosts.lockedroot = {
inherit root; inherit root;
basicAuth.alice = "jane"; basicAuth.alice = "pwofa";
}; };
virtualHosts.lockedsubdir = { virtualHosts.lockedsubdir = {
inherit root; inherit root;
locations."/sublocation/" = { locations."/sublocation/" = {
alias = "${root}/"; alias = "${root}/";
basicAuth.bob = "john"; basicAuth.bob = "pwofb";
}; };
}; };
}; };
@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot") webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")
webserver.succeed( webserver.succeed(
"curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot" "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"
) )
webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir") webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")
@ -41,7 +41,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html" "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"
) )
webserver.succeed( webserver.succeed(
"curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html" "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"
) )
''; '';
}) })

2
nixos/tests/sympa.nix
View file

@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
webHost = "localhost"; webHost = "localhost";
}; };
}; };
listMasters = [ "joe@example.org" ]; listMasters = [ "bob@example.org" ];
web.enable = true; web.enable = true;
web.https = false; web.https = false;
database = { database = {

6
nixos/tests/systemd-nspawn.nix
View file

@ -10,8 +10,8 @@ let
Key-Length: 1024 Key-Length: 1024
Subkey-Type: ELG-E Subkey-Type: ELG-E
Subkey-Length: 1024 Subkey-Length: 1024
Name-Real: Joe Tester Name-Real: Bob Foobar
Name-Email: joe@foo.bar Name-Email: bob@foo.bar
Expire-Date: 0 Expire-Date: 0
# Do a commit here, so that we can later print "done" # Do a commit here, so that we can later print "done"
%commit %commit
@ -19,7 +19,7 @@ let
EOF EOF
gpg --batch --generate-key foo gpg --batch --generate-key foo
rm $out/S.gpg-agent $out/S.gpg-agent.* rm $out/S.gpg-agent $out/S.gpg-agent.*
gpg --export joe@foo.bar -a > $out/pubkey.gpg gpg --export bob@foo.bar -a > $out/pubkey.gpg
''); '');
nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''

2
nixos/tests/xmpp/xmpp-sendmessage.nix
View file

@ -6,7 +6,7 @@ let
Please find this *really* important attachment. Please find this *really* important attachment.
Yours truly, Yours truly,
John Bob
''; '';
in writeScriptBin "send-message" '' in writeScriptBin "send-message" ''
#!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter}

6
pkgs/build-support/docker/examples.nix
View file

@ -584,8 +584,8 @@ rec {
pkgs.pkgsStatic.busybox pkgs.pkgsStatic.busybox
]; ];
fakeRootCommands = '' fakeRootCommands = ''
mkdir -p ./home/jane mkdir -p ./home/alice
chown 1000 ./home/jane chown 1000 ./home/alice
ln -s ${pkgs.hello.overrideAttrs (o: { ln -s ${pkgs.hello.overrideAttrs (o: {
# A unique `hello` to make sure that it isn't included via another mechanism by accident. # A unique `hello` to make sure that it isn't included via another mechanism by accident.
configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ];
@ -607,7 +607,7 @@ rec {
]; ];
# tarball consisting of bash and layered image with different owner of the # tarball consisting of bash and layered image with different owner of the
# /home/jane directory # /home/alice directory
mergedBashFakeRoot = pkgs.dockerTools.mergeImages [ mergedBashFakeRoot = pkgs.dockerTools.mergeImages [
bash bash
layeredImageWithFakeRootCommands layeredImageWithFakeRootCommands