mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-05 17:27:50 +00:00
[Services] avoid conflict between systemd-resolved and avahi-daemon
This commit is contained in:
parent
60ee53b417
commit
2b49bf3e90
1 changed files with 12 additions and 2 deletions
|
|
@ -136,9 +136,9 @@ in {
|
||||||
|
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
enable = !generalCfg.minimal; # .lan/.local resolution
|
enable = !generalCfg.minimal; # .lan/.local resolution
|
||||||
nssmdns4 = true; # .lan/.local resolution
|
nssmdns4 = !config.services.resolved.enable; # .lan/.local resolution
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
reflector = true;
|
reflector = !config.services.resolved.enable;
|
||||||
publish = {
|
publish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = true;
|
domain = true;
|
||||||
|
|
@ -147,8 +147,18 @@ in {
|
||||||
workstation = mkDefault (desktopCfg.enable && !laptopCfg.enable);
|
workstation = mkDefault (desktopCfg.enable && !laptopCfg.enable);
|
||||||
hinfo = true; # Whether to register a mDNS HINFO record which contains information about the local operating system and CPU.
|
hinfo = true; # Whether to register a mDNS HINFO record which contains information about the local operating system and CPU.
|
||||||
};
|
};
|
||||||
|
extraConfig = mkIf config.services.resolved.enable ''
|
||||||
|
[server]
|
||||||
|
enable-dbus=warn
|
||||||
|
#disallow-other-stacks=yes
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.resolved.extraConfig =
|
||||||
|
''
|
||||||
|
mDNS=no
|
||||||
|
'';
|
||||||
|
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue