diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-15 00:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 00:01:33 +0000 |
| commit | 728f30ca03ec6c953ff420425cb642d6dc8c5174 (patch) | |
| tree | 4f99fd5a240ffba488033103cacea0cea31bb1cc /nixos/modules | |
| parent | b2488e1c17bf43be1134f21169034109555d68e3 (diff) | |
| parent | bcd607489d76795508c48261e1ad05f5d4b7672f (diff) | |
| download | nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar.gz nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar.bz2 nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar.lz nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar.xz nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.tar.zst nixpkgs-728f30ca03ec6c953ff420425cb642d6dc8c5174.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/misc/ids.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/networking/vsftpd.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 30cd8615acf..77575f32274 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -46,7 +46,7 @@ in messagebus = 4; # D-Bus haldaemon = 5; #disk = 6; # unused - vsftpd = 7; + #vsftpd = 7; # dynamically allocated ass of 2021-09-14 ftp = 8; bitlbee = 9; #avahi = 10; # removed 2019-05-22 @@ -366,7 +366,7 @@ in messagebus = 4; # D-Bus haldaemon = 5; disk = 6; - vsftpd = 7; + #vsftpd = 7; # dynamically allocated as of 2021-09-14 ftp = 8; bitlbee = 9; #avahi = 10; # removed 2019-05-22 diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index c57994533c1..5489f74bf03 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -282,7 +282,8 @@ in users.users = { "vsftpd" = { - uid = config.ids.uids.vsftpd; + group = "vsftpd"; + isSystemUser = true; description = "VSFTPD user"; home = if cfg.localRoot != null then cfg.localRoot # <= Necessary for virtual users. @@ -297,6 +298,7 @@ in }; }; + users.groups.vsftpd = {}; users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 6671592202f..9693e2e377a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1060,6 +1060,7 @@ in uid = config.ids.uids.systemd-coredump; group = "systemd-coredump"; }; + users.groups.systemd-coredump = {}; users.users.systemd-network = { uid = config.ids.uids.systemd-network; group = "systemd-network"; |