From b1e07e8d002b0078a3b56a22979f47bcccf73306 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Wed, 6 Jul 2005 16:19:41 +0000 Subject: renamed avahi to avahi-daemon git-svn-id: file:///home/lennart/svn/public/avahi/trunk@166 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-daemon/Makefile.am | 16 ++++++++-------- avahi-daemon/README | 6 ------ avahi-daemon/avahi-daemon.conf | 20 ++++++++++++++++++++ avahi-daemon/avahi.conf | 20 -------------------- 4 files changed, 28 insertions(+), 34 deletions(-) delete mode 100644 avahi-daemon/README create mode 100644 avahi-daemon/avahi-daemon.conf delete mode 100644 avahi-daemon/avahi.conf (limited to 'avahi-daemon') diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index 2f09490..f746a49 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -25,7 +25,7 @@ AM_CFLAGS= \ -DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \ -DAVAHI_SOCKET=\"$(avahi_socket)\" \ -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \ - -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" + -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" AM_LDADD=-lexpat @@ -48,15 +48,15 @@ endif AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' bin_PROGRAMS = \ - avahi + avahi-daemon -avahi_SOURCES = \ +avahi_daemon_SOURCES = \ main.c main.h \ simple-protocol.c simple-protocol.h \ static-services.c static-services.h pkgsysconf_DATA = \ - avahi.conf + avahi-daemon.conf service_DATA = \ example.service @@ -64,10 +64,10 @@ service_DATA = \ pkgdata_DATA = \ avahi-service.dtd -EXTRA_DIST = avahi-service.dtd avahi.conf example.service +EXTRA_DIST = avahi-service.dtd avahi-daemon.conf example.service if ENABLE_DBUS -avahi_SOURCES += dbus-protocol.c dbus-protocol.h +avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = avahi-dbus.conf @@ -75,8 +75,8 @@ dbusservice_DATA = avahi-dbus.conf EXTRA_DIST += $(dbusservice_DATA) endif -avahi_CFLAGS = $(AM_CFLAGS) -avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +avahi_daemon_CFLAGS = $(AM_CFLAGS) +avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la xmllint: xmllint --noout --valid example.service diff --git a/avahi-daemon/README b/avahi-daemon/README deleted file mode 100644 index e5f6405..0000000 --- a/avahi-daemon/README +++ /dev/null @@ -1,6 +0,0 @@ -On most systems you will need to setup a security policy for avahi to allow it to own the Avahi service on the system d-bus. - -You can find an example in avahi.conf.example, this usually goes in /etc/dbus-1/system.d -You will need to change the username 'lathiat' to whatever username you use for testing this code (later it will be a dedicated 'avahi' user) - -In future this stuff should be handled automatically but for now some manual setup is required. diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf new file mode 100644 index 0000000..fc47ecf --- /dev/null +++ b/avahi-daemon/avahi-daemon.conf @@ -0,0 +1,20 @@ +[server] +#host-name=foo +#domain-name=local +use-ipv4=yes +use-ipv6=no +check-response-ttl=no +use-iff-running=yes +enable-dbus=yes + +[publish] +publish-addresses=yes +publish-hinfo=yes +publish-workstation=yes +publish-domain=yes +#publish-dns-servers=192.168.50.1,192.168.50.2 +#publish-resolv-conf-dns-servers=yes + +[reflector] +enable-reflector=no +reflect-ipv=no diff --git a/avahi-daemon/avahi.conf b/avahi-daemon/avahi.conf deleted file mode 100644 index fc47ecf..0000000 --- a/avahi-daemon/avahi.conf +++ /dev/null @@ -1,20 +0,0 @@ -[server] -#host-name=foo -#domain-name=local -use-ipv4=yes -use-ipv6=no -check-response-ttl=no -use-iff-running=yes -enable-dbus=yes - -[publish] -publish-addresses=yes -publish-hinfo=yes -publish-workstation=yes -publish-domain=yes -#publish-dns-servers=192.168.50.1,192.168.50.2 -#publish-resolv-conf-dns-servers=yes - -[reflector] -enable-reflector=no -reflect-ipv=no -- cgit