avahi-daemo: remove orange interface

- fix Bug 13202
- add non-default config file
- enable mDNS reflector
- remove IPv6

Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/avahi/avahi-daemon.conf b/config/avahi/avahi-daemon.conf
new file mode 100644 (file)
index 0000000..7e2b951
--- /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 6564e6c38361548da1a3d38c34c676021f089a69..fe5df10db842eb2139c300dfbbf62e93bfc28a52 100644 (file)
--- 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))