nixos/system.nss*: remove with lib;
This commit is contained in:
parent
87c8da00fa
commit
d65b7dbb29
@ -1,16 +1,12 @@
|
||||
# Configuration for the Name Service Switch (/etc/nsswitch.conf).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options = {
|
||||
|
||||
# NSS modules. Hacky!
|
||||
# Only works with nscd!
|
||||
system.nssModules = mkOption {
|
||||
type = types.listOf types.path;
|
||||
system.nssModules = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
internal = true;
|
||||
default = [ ];
|
||||
description = ''
|
||||
@ -21,13 +17,13 @@ with lib;
|
||||
apply = list:
|
||||
{
|
||||
inherit list;
|
||||
path = makeLibraryPath list;
|
||||
path = lib.makeLibraryPath list;
|
||||
};
|
||||
};
|
||||
|
||||
system.nssDatabases = {
|
||||
passwd = mkOption {
|
||||
type = types.listOf types.str;
|
||||
passwd = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of passwd entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -38,8 +34,8 @@ with lib;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.listOf types.str;
|
||||
group = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of group entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -50,8 +46,8 @@ with lib;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
shadow = mkOption {
|
||||
type = types.listOf types.str;
|
||||
shadow = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of shadow entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -62,8 +58,8 @@ with lib;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
sudoers = mkOption {
|
||||
type = types.listOf types.str;
|
||||
sudoers = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of sudoers entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -74,8 +70,8 @@ with lib;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
hosts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
hosts = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of hosts entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -86,8 +82,8 @@ with lib;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
services = mkOption {
|
||||
type = types.listOf types.str;
|
||||
services = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
List of services entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
@ -101,7 +97,7 @@ with lib;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "system" "nssHosts" ] [ "system" "nssDatabases" "hosts" ])
|
||||
(lib.mkRenamedOptionModule [ "system" "nssHosts" ] [ "system" "nssDatabases" "hosts" ])
|
||||
];
|
||||
|
||||
config = {
|
||||
@ -121,30 +117,30 @@ with lib;
|
||||
# Name Service Switch configuration file. Required by the C
|
||||
# library.
|
||||
environment.etc."nsswitch.conf".text = ''
|
||||
passwd: ${concatStringsSep " " config.system.nssDatabases.passwd}
|
||||
group: ${concatStringsSep " " config.system.nssDatabases.group}
|
||||
shadow: ${concatStringsSep " " config.system.nssDatabases.shadow}
|
||||
sudoers: ${concatStringsSep " " config.system.nssDatabases.sudoers}
|
||||
passwd: ${lib.concatStringsSep " " config.system.nssDatabases.passwd}
|
||||
group: ${lib.concatStringsSep " " config.system.nssDatabases.group}
|
||||
shadow: ${lib.concatStringsSep " " config.system.nssDatabases.shadow}
|
||||
sudoers: ${lib.concatStringsSep " " config.system.nssDatabases.sudoers}
|
||||
|
||||
hosts: ${concatStringsSep " " config.system.nssDatabases.hosts}
|
||||
hosts: ${lib.concatStringsSep " " config.system.nssDatabases.hosts}
|
||||
networks: files
|
||||
|
||||
ethers: files
|
||||
services: ${concatStringsSep " " config.system.nssDatabases.services}
|
||||
services: ${lib.concatStringsSep " " config.system.nssDatabases.services}
|
||||
protocols: files
|
||||
rpc: files
|
||||
'';
|
||||
|
||||
system.nssDatabases = {
|
||||
passwd = mkBefore [ "files" ];
|
||||
group = mkBefore [ "files" ];
|
||||
shadow = mkBefore [ "files" ];
|
||||
sudoers = mkBefore [ "files" ];
|
||||
hosts = mkMerge [
|
||||
(mkOrder 998 [ "files" ])
|
||||
(mkOrder 1499 [ "dns" ])
|
||||
passwd = lib.mkBefore [ "files" ];
|
||||
group = lib.mkBefore [ "files" ];
|
||||
shadow = lib.mkBefore [ "files" ];
|
||||
sudoers = lib.mkBefore [ "files" ];
|
||||
hosts = lib.mkMerge [
|
||||
(lib.mkOrder 998 [ "files" ])
|
||||
(lib.mkOrder 1499 [ "dns" ])
|
||||
];
|
||||
services = mkBefore [ "files" ];
|
||||
services = lib.mkBefore [ "files" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user