Adapt Avahi configuration to latest changes in Debian.

* Set AVAHI_DAEMON_DETECT_LOCAL to 1 * Remove all default rlimits from avahi-daemon.conf. See https://github.com/lathiat/avahi/blob/master/docs/NEWS#L112 Signed-off-by: Volker Theile <votdev@gmx.de>
openmediavault · Oct 31, 2020 · 9cc347b · 9cc347b
1 parent 9d103b9
commit 9cc347b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault (5.5.15-1) stable; urgency=low
+
+  * Adapt Avahi configuration to latest changes in Debian.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Sat, 31 Oct 2020 09:06:34 +0100
+
 openmediavault (5.5.14-1) stable; urgency=low
 
   * Issue #812: Cron script erroneously reports success though failed.

diff --git a/deb/openmediavault/debian/openmediavault.postinst b/deb/openmediavault/debian/openmediavault.postinst
@@ -254,14 +254,17 @@ case "$1" in
 			usermod -a -G ${OMV_WEBGUI_ADMINGROUP_NAME} ${OMV_WEBGUI_ADMINUSER_NAME} || :
 		fi
 		if dpkg --compare-versions "$2" lt-nl "5.5.9"; then
-		  omv_module_set_dirty proftpd
+			omv_module_set_dirty proftpd
 		fi
 		if dpkg --compare-versions "$2" lt-nl "5.5.13"; then
-		  omv_module_set_dirty proftpd
+			omv_module_set_dirty proftpd
 		fi
 		if dpkg --compare-versions "$2" lt-nl "5.5.14"; then
-		  omv_module_set_dirty cron
-		  omv_module_set_dirty rsync
+			omv_module_set_dirty cron
+			omv_module_set_dirty rsync
+		fi
+		if dpkg --compare-versions "$2" lt-nl "5.5.15"; then
+			omv_module_set_dirty avahi
 		fi
 
 		########################################################################

diff --git a/deb/openmediavault/srv/salt/omv/deploy/avahi/files/etc-avahi-avahi-daemon_conf.j2 b/deb/openmediavault/srv/salt/omv/deploy/avahi/files/etc-avahi-avahi-daemon_conf.j2
@@ -4,6 +4,8 @@
 {%- set allow_point_to_point = salt['pillar.get']('default:OMV_AVAHIDAEMON_ALLOW_POINT_TO_POINT', 'no') -%}
 {%- set enable_reflector = salt['pillar.get']('default:OMV_AVAHIDAEMON_ENABLE_REFLECTOR', 'no') -%}
 {%- set rlimit_nproc = salt['pillar.get']('default:OMV_AVAHIDAEMON_RLIMIT_NPROC', '3') -%}
+{%- set publish_hinfo = salt['pillar.get']('default:OMV_AVAHIDAEMON_PUBLISH_HINFO', 'no') -%}
+{%- set publish_workstation = salt['pillar.get']('default:OMV_AVAHIDAEMON_PUBLISH_WORKSTATION', 'no') -%}
 [server]
 #host-name=foo
 #domain-name=local
@@ -34,8 +36,8 @@ enable-wide-area=yes
 #disable-user-service-publishing=no
 #add-service-cookie=no
 #publish-addresses=yes
-#publish-hinfo=yes
-#publish-workstation=yes
+publish-hinfo={{ publish_hinfo }}
+publish-workstation={{ publish_workstation }}
 #publish-domain=yes
 #publish-dns-servers=192.168.50.1, 192.168.50.2
 #publish-resolv-conf-dns-servers=yes
@@ -48,9 +50,9 @@ enable-reflector={{ enable_reflector }}
 
 [rlimits]
 #rlimit-as=
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=768
-rlimit-stack=4194304
-rlimit-nproc={{ rlimit_nproc }}
+#rlimit-core=0
+#rlimit-data=4194304
+#rlimit-fsize=0
+#rlimit-nofile=768
+#rlimit-stack=4194304
+#rlimit-nproc={{ rlimit_nproc }}
diff --git a/deb/openmediavault/srv/salt/omv/deploy/avahi/files/etc-default-avahi-daemon.j2 b/deb/openmediavault/srv/salt/omv/deploy/avahi/files/etc-default-avahi-daemon.j2
@@ -1,3 +1,3 @@
-{%- set detect_local = salt['pillar.get']('default:OMV_AVAHIDAEMON_DETECTLOCAL', '0') -%}
+{%- set detect_local = salt['pillar.get']('default:OMV_AVAHIDAEMON_DETECTLOCAL', '1') -%}
 {{ pillar['headers']['multiline'] }}
 AVAHI_DAEMON_DETECT_LOCAL={{ detect_local }}