From patchwork Sun Aug 20 17:29:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jon X-Patchwork-Id: 7110 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RTN211f3Jz3wlH for ; Sun, 20 Aug 2023 17:31:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RTN1z0stPzyP; Sun, 20 Aug 2023 17:31:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RTN1z06HSz2yWL; Sun, 20 Aug 2023 17:31:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RTN1x6grnz2xSJ for ; Sun, 20 Aug 2023 17:31:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RTN1w0qC3zX4; Sun, 20 Aug 2023 17:31:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1692552676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=TdyWpm1RoXMtKrwG79uIIEWalKJvOgeEsbZwlWLSmBI=; b=xw4amIJXd2S/VuhtrwpkEOrqv+N9G8xI5BQ+9Jixl366yQAsFjvRsEDJKeY7sE3sjj69q8 NiFX36u5uoEs1OAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1692552676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=TdyWpm1RoXMtKrwG79uIIEWalKJvOgeEsbZwlWLSmBI=; b=e1LdQBsURau2xSQfVZNhoivyx4xFZFpKb3JSQ99Fu99bzuTTb3w11BHNyTMQ5BXn7IAS2u RM7jSOYeiZDyFGfbtPA2FfHmDvz26zFM5+HysIOrTda7axzJDBkD46AYW3vZNFZBvacAyK EMyf323uZGyyueEdRy6sJBBUiKwbxUlNT/I1LPRUxISoVEO/5W3STzS7Ic5PrGZW+tXRIq Dyjm8Aj5MDJQFfwJ6gh0rWH+RN5f53I48tvYz5ohKTcxGmHlTKgCZzaybzy8oSIfHdMME+ DDnLZ4Lla5XqwMEA6nXxnT69tC8uBW5oS/h8sGPsHiZod29aFdsijiLet82gaA== From: Jon Murphy To: development@lists.ipfire.org Subject: [PATCH] avahi-daemo: remove orange interface Date: Sun, 20 Aug 2023 12:29:17 -0500 Message-Id: <20230820172917.1806888-1-jon.murphy@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - fix Bug 13202 - add non-default config file - enable mDNS reflector - remove IPv6 Signed-off-by: Jon Murphy --- config/avahi/avahi-daemon.conf | 69 ++++++++++++++++++++++++++++++++++ lfs/avahi | 9 +++-- 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 config/avahi/avahi-daemon.conf diff --git a/config/avahi/avahi-daemon.conf b/config/avahi/avahi-daemon.conf new file mode 100644 index 000000000..7e2b951db --- /dev/null +++ b/config/avahi/avahi-daemon.conf @@ -0,0 +1,69 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# See avahi-daemon.conf(5) for more information on this configuration +# file! + +[server] +#host-name=foo +#domain-name=local +#browse-domains=0pointer.de, zeroconf.org +use-ipv4=yes +use-ipv6=no +#allow-interfaces=eth0 +deny-interfaces=orange0 +#check-response-ttl=no +#use-iff-running=no +#enable-dbus=yes +#disallow-other-stacks=no +#allow-point-to-point=no +#cache-entries-max=4096 +#clients-max=4096 +#objects-per-client-max=1024 +#entries-per-entry-group-max=32 +ratelimit-interval-usec=1000000 +ratelimit-burst=1000 + +[wide-area] +enable-wide-area=yes + +[publish] +#disable-publishing=no +#disable-user-service-publishing=no +#add-service-cookie=no +#publish-addresses=yes +publish-hinfo=no +publish-workstation=no +#publish-domain=yes +#publish-dns-servers=192.168.50.1, 192.168.50.2 +#publish-resolv-conf-dns-servers=yes +#publish-aaaa-on-ipv4=yes +#publish-a-on-ipv6=no + +[reflector] +enable-reflector=yes +#reflect-ipv=no +#reflect-filters=_airplay._tcp.local,_raop._tcp.local + +[rlimits] +#rlimit-as= +#rlimit-core=0 +#rlimit-data=8388608 +#rlimit-fsize=0 +#rlimit-nofile=768 +#rlimit-stack=8388608 +#rlimit-nproc=3 diff --git a/lfs/avahi b/lfs/avahi index 6564e6c38..fe5df10db 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,9 +32,9 @@ THISAPP = avahi-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 12 +PAK_VER = 13 DEPS = dbus libdaemon @@ -101,8 +101,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + # Add conf file to /etc/avahi directory + cp -vf $(DIR_CONF)/avahi/avahi-daemon.conf /etc/avahi + # Install configuration for samba - cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + cp -avf $(DIR_CONF)/avahi/smb.service /etc/avahi/services/smb.service # Install initscript $(call INSTALL_INITSCRIPTS,$(SERVICES))