summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-07-30 19:17:00 +0000
committerLennart Poettering <lennart@poettering.net>2005-07-30 19:17:00 +0000
commit650b24cba8f5f2da9481b2349b9ed3a419e4e7ab (patch)
tree40ea3783fc15ab5b459be225de46ab2f0c6f96bd
parent32260f5d2ca0370b07da494b60c01a3a861a0c20 (diff)
* don't install example.service
* add ssh.service and install it by default git-svn-id: file:///home/lennart/svn/public/avahi/trunk@205 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-daemon/Makefile.am6
-rw-r--r--avahi-daemon/example.service21
-rw-r--r--avahi-daemon/ssh.service14
3 files changed, 31 insertions, 10 deletions
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index b56aa55..62c2cd3 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -61,7 +61,7 @@ pkgsysconf_DATA = \
avahi-daemon.conf
service_DATA = \
- example.service
+ ssh.service
pkgdata_DATA = \
avahi-service.dtd
@@ -76,7 +76,9 @@ EXTRA_DIST = \
EntryGroup.introspect \
DomainBrowser.introspect \
ServiceTypeBrowser.introspect \
- ServiceBrowser.introspect
+ ServiceBrowser.introspect \
+ ssh.service \
+ example.service
if ENABLE_DBUS
avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
diff --git a/avahi-daemon/example.service b/avahi-daemon/example.service
index 6892d51..9b2e891 100644
--- a/avahi-daemon/example.service
+++ b/avahi-daemon/example.service
@@ -4,21 +4,26 @@
<!-- $Id$ -->
- <name replace-wildcards="yes">Remote Terminal on %h</name>
+ <name replace-wildcards="yes">Printer on %h</name>
<service>
- <type>_ssh._tcp</type>
- <port>22</port>
+ <type>_printer._tcp</type>
+ <port>515</port>
</service>
<service>
- <type>_telnet._tcp</type>
+ <type>_ipp._tcp</type>
+ <port>631</port>
+ </service>
+
+ <service>
+ <type>_uberprinter._tcp</type>
<domain-name>local</domain-name>
<host-name>quux.local</host-name>
- <port>23</port>
- <txt-record>foo=bar</txt-record>
- <txt-record>waldo=buzz</txt-record>
- <txt-record>another=record</txt-record>
+ <port>4711</port>
+ <txt-record>this=is</txt-record>
+ <txt-record>a=really</txt-record>
+ <txt-record>bad=example</txt-record>
</service>
</service-group>
diff --git a/avahi-daemon/ssh.service b/avahi-daemon/ssh.service
new file mode 100644
index 0000000..2f1bf7f
--- /dev/null
+++ b/avahi-daemon/ssh.service
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+
+ <!-- $Id$ -->
+
+ <name replace-wildcards="yes">Remote Terminal on %h</name>
+
+ <service>
+ <type>_ssh._tcp</type>
+ <port>22</port>
+ </service>
+
+</service-group>