Merge lp:~smoser/orchestra/add-avahi into lp:orchestra

[Scott Moser]

This makes orchestra-provisioing-server advertise via avahi a service named '_orchestra_provisioning_server._tcp'.

It does this at the moment on a hard coded 'port 80'. We could optionally, in the future try to read
a cobbler config file to get the port from it, in some other way ensure that they're on the same port.

[lp:~smoser/orchestra/add-avahi]

282. By Scott Moser on 2011-11-28

advertise service both on ipv4 and ipv6

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-22 20:25:03 +0000
+++ debian/changelog	2011-11-28 19:06:23 +0000
@@ -1,4 +1,16 @@
+<<<<<<< TREE
 orchestra (2.25) unreleased; urgency=low
+=======
+orchestra (2.22ubuntu1) unreleased; urgency=low
+
+  * provisioning-server/
+    /etc/avahi/services/orchestra_provisioning_server.service
+    Advertise the orchestra provisioning service via avahi (LP: #893189)
+
+ -- Scott Moser <[e-mail]>  Mon, 28 Nov 2011 13:18:54 -0500
+
+orchestra (2.22) unreleased; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * UNRELEASED
 

=== modified file 'debian/control'
--- debian/control	2011-11-22 18:13:12 +0000
+++ debian/control	2011-11-28 19:06:23 +0000
@@ -112,6 +112,7 @@
 Package: ubuntu-orchestra-provisioning-server
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
+ avahi-utils,
  cobbler,
  distro-info,
  run-one,

=== added directory 'provisioning-server/etc/avahi'
=== added directory 'provisioning-server/etc/avahi/services'
=== added file 'provisioning-server/etc/avahi/services/orchestra_provisioning_server.service'
--- provisioning-server/etc/avahi/services/orchestra_provisioning_server.service	1970-01-01 00:00:00 +0000
+++ provisioning-server/etc/avahi/services/orchestra_provisioning_server.service	2011-11-28 19:06:23 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+ <name replace-wildcards="yes">Orchestra Provisioning Server on %h</name>
+ <service protocol="ipv4">
+  <type>_orchestra_provisioning_server._tcp</type>
+  <port>80</port>
+ </service>
+ <service protocol="ipv6">
+  <type>_orchestra_provisioning_server._tcp</type>
+  <port>80</port>
+ </service>
+</service-group>