nixos/services.avahi: remove with lib;
This commit is contained in:
Felix Buehler
Jörg Thalheim
parent
d861803952
commit
eb8d4ed264
@ -1,7 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.avahi;
|
||||
|
||||
@ -13,15 +10,15 @@ let
|
||||
# a host name from DHCP. In that case, let Avahi take whatever the
|
||||
# current host name is; setting `host-name' to the empty string in
|
||||
# `avahi-daemon.conf' would be invalid.
|
||||
optionalString (hostName != "") "host-name=${hostName}"}
|
||||
browse-domains=${concatStringsSep ", " browseDomains}
|
||||
lib.optionalString (hostName != "") "host-name=${hostName}"}
|
||||
browse-domains=${lib.concatStringsSep ", " browseDomains}
|
||||
use-ipv4=${yesNo ipv4}
|
||||
use-ipv6=${yesNo ipv6}
|
||||
${optionalString (allowInterfaces!=null) "allow-interfaces=${concatStringsSep "," allowInterfaces}"}
|
||||
${optionalString (denyInterfaces!=null) "deny-interfaces=${concatStringsSep "," denyInterfaces}"}
|
||||
${optionalString (domainName!=null) "domain-name=${domainName}"}
|
||||
${lib.optionalString (allowInterfaces!=null) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"}
|
||||
${lib.optionalString (denyInterfaces!=null) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"}
|
||||
${lib.optionalString (domainName!=null) "domain-name=${domainName}"}
|
||||
allow-point-to-point=${yesNo allowPointToPoint}
|
||||
${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"}
|
||||
${lib.optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"}
|
||||
|
||||
[wide-area]
|
||||
enable-wide-area=${yesNo wideArea}
|
||||
@ -46,8 +43,8 @@ in
|
||||
];
|
||||
|
||||
options.services.avahi = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to run the Avahi daemon, which allows Avahi clients
|
||||
@ -57,28 +54,28 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "avahi" { };
|
||||
package = lib.mkPackageOption pkgs "avahi" { };
|
||||
|
||||
hostName = mkOption {
|
||||
type = types.str;
|
||||
hostName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = config.networking.hostName;
|
||||
defaultText = literalExpression "config.networking.hostName";
|
||||
defaultText = lib.literalExpression "config.networking.hostName";
|
||||
description = ''
|
||||
Host name advertised on the LAN. If not set, avahi will use the value
|
||||
of {option}`config.networking.hostName`.
|
||||
'';
|
||||
};
|
||||
|
||||
domainName = mkOption {
|
||||
type = types.str;
|
||||
domainName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "local";
|
||||
description = ''
|
||||
Domain name for all advertisements.
|
||||
'';
|
||||
};
|
||||
|
||||
browseDomains = mkOption {
|
||||
type = types.listOf types.str;
|
||||
browseDomains = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [ "0pointer.de" "zeroconf.org" ];
|
||||
description = ''
|
||||
@ -86,20 +83,20 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
ipv4 = mkOption {
|
||||
type = types.bool;
|
||||
ipv4 = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Whether to use IPv4.";
|
||||
};
|
||||
|
||||
ipv6 = mkOption {
|
||||
type = types.bool;
|
||||
ipv6 = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to use IPv6.";
|
||||
};
|
||||
|
||||
allowInterfaces = mkOption {
|
||||
type = types.nullOr (types.listOf types.str);
|
||||
allowInterfaces = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
default = null;
|
||||
description = ''
|
||||
List of network interfaces that should be used by the {command}`avahi-daemon`.
|
||||
@ -108,8 +105,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
denyInterfaces = mkOption {
|
||||
type = types.nullOr (types.listOf types.str);
|
||||
denyInterfaces = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
default = null;
|
||||
description = ''
|
||||
List of network interfaces that should be ignored by the
|
||||
@ -119,8 +116,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to open the firewall for UDP port 5353.
|
||||
@ -128,8 +125,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
allowPointToPoint = mkOption {
|
||||
type = types.bool;
|
||||
allowPointToPoint = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large
|
||||
@ -138,22 +135,22 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
wideArea = mkOption {
|
||||
type = types.bool;
|
||||
wideArea = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable wide-area service discovery.";
|
||||
};
|
||||
|
||||
reflector = mkOption {
|
||||
type = types.bool;
|
||||
reflector = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Reflect incoming mDNS requests to all allowed network interfaces.";
|
||||
};
|
||||
|
||||
extraServiceFiles = mkOption {
|
||||
type = with types; attrsOf (either str path);
|
||||
extraServiceFiles = lib.mkOption {
|
||||
type = with lib.types; attrsOf (either str path);
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service";
|
||||
smb = '''
|
||||
@ -176,26 +173,26 @@ in
|
||||
};
|
||||
|
||||
publish = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to allow publishing in general.";
|
||||
};
|
||||
|
||||
userServices = mkOption {
|
||||
type = types.bool;
|
||||
userServices = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to publish user services. Will set `addresses=true`.";
|
||||
};
|
||||
|
||||
addresses = mkOption {
|
||||
type = types.bool;
|
||||
addresses = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to register mDNS address records for all local IP addresses.";
|
||||
};
|
||||
|
||||
hinfo = mkOption {
|
||||
type = types.bool;
|
||||
hinfo = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to register a mDNS HINFO record which contains information about the
|
||||
@ -203,23 +200,23 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
workstation = mkOption {
|
||||
type = types.bool;
|
||||
workstation = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to register a service of type "_workstation._tcp" on the local LAN.
|
||||
'';
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.bool;
|
||||
domain = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to announce the locally used domain name for browsing by other hosts.";
|
||||
};
|
||||
};
|
||||
|
||||
nssmdns4 = mkOption {
|
||||
type = types.bool;
|
||||
nssmdns4 = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable the mDNS NSS (Name Service Switch) plug-in for IPv4.
|
||||
@ -228,8 +225,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
nssmdns6 = mkOption {
|
||||
type = types.bool;
|
||||
nssmdns6 = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable the mDNS NSS (Name Service Switch) plug-in for IPv6.
|
||||
@ -243,8 +240,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
cacheEntriesMax = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
cacheEntriesMax = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = ''
|
||||
Number of resource records to be cached per interface. Use 0 to
|
||||
@ -252,8 +249,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra config to append to avahi-daemon.conf.
|
||||
@ -261,7 +258,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
users.users.avahi = {
|
||||
description = "avahi-daemon privilege separation user";
|
||||
home = "/var/empty";
|
||||
@ -271,7 +268,7 @@ in
|
||||
|
||||
users.groups.avahi = { };
|
||||
|
||||
system.nssModules = optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns;
|
||||
system.nssModules = lib.optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns;
|
||||
system.nssDatabases.hosts = let
|
||||
mdns = if (cfg.nssmdns4 && cfg.nssmdns6) then
|
||||
"mdns"
|
||||
@ -281,17 +278,17 @@ in
|
||||
"mdns4"
|
||||
else
|
||||
"";
|
||||
in optionals (cfg.nssmdns4 || cfg.nssmdns6) (mkMerge [
|
||||
(mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve
|
||||
(mkAfter [ "${mdns}" ]) # after dns
|
||||
in lib.optionals (cfg.nssmdns4 || cfg.nssmdns6) (lib.mkMerge [
|
||||
(lib.mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve
|
||||
(lib.mkAfter [ "${mdns}" ]) # after dns
|
||||
]);
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc = (mapAttrs'
|
||||
(n: v: nameValuePair
|
||||
environment.etc = (lib.mapAttrs'
|
||||
(n: v: lib.nameValuePair
|
||||
"avahi/services/${n}.service"
|
||||
{ ${if types.path.check v then "source" else "text"} = v; }
|
||||
{ ${if lib.types.path.check v then "source" else "text"} = v; }
|
||||
)
|
||||
cfg.extraServiceFiles);
|
||||
|
||||
@ -326,6 +323,6 @@ in
|
||||
services.dbus.enable = true;
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
|
||||
networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 5353 ];
|
||||
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 5353 ];
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user