From b37470f341cede429daa62d384a27f439932d86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= <dev@ntr.li>
Date: Mon, 2 Dec 2024 20:36:33 +0100
Subject: [PATCH] modules/avahi: Sync module defaults with upstream

This contribution syncs the module's default with upstream
avahi's defaults.
---
 nixos/doc/manual/release-notes/rl-2505.section.md  |  2 ++
 nixos/modules/services/networking/avahi-daemon.nix | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index a82932ce66262d..ccfa6b1f2a8120 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -72,4 +72,6 @@
 
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
+- The defaults of `services.avahi.publish` have been updated to upstream's default.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 73fc210728d888..8472d6d93a1a16 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -175,25 +175,25 @@ in
     publish = {
       enable = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = "Whether to allow publishing in general.";
       };
 
       userServices = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = "Whether to publish user services. Will set `addresses=true`.";
       };
 
       addresses = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = "Whether to register mDNS address records for all local IP addresses.";
       };
 
       hinfo = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = ''
           Whether to register a mDNS HINFO record which contains information about the
           local operating system and CPU.
@@ -202,7 +202,7 @@ in
 
       workstation = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = ''
           Whether to register a service of type "_workstation._tcp" on the local LAN.
         '';
@@ -210,14 +210,14 @@ in
 
       domain = lib.mkOption {
         type = lib.types.bool;
-        default = false;
+        default = true;
         description = "Whether to announce the locally used domain name for browsing by other hosts.";
       };
     };
 
     nssmdns4 = lib.mkOption {
       type = lib.types.bool;
-      default = false;
+      default = true;
       description = ''
         Whether to enable the mDNS NSS (Name Service Switch) plug-in for IPv4.
         Enabling it allows applications to resolve names in the `.local`