aboutsummaryrefslogtreecommitdiffstats
path: root/tools/examples
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-05-23 10:41:44 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-05-23 10:41:44 +0100
commitd6f7e230eb1cce1fafb54f85abd9b643113de551 (patch)
tree3161eb599ceea10c9cbb1b1ce1e41c2d12e057e4 /tools/examples
parent1580fd56fd302e7ceec9ff15e02a0323dfd5be30 (diff)
downloadxen-d6f7e230eb1cce1fafb54f85abd9b643113de551.tar.gz
xen-d6f7e230eb1cce1fafb54f85abd9b643113de551.tar.bz2
xen-d6f7e230eb1cce1fafb54f85abd9b643113de551.zip
Make ssl relocation server listen on different port
This patch makes ssl relocation server listen on 8003 if enabled. Whether to start ssl relocation server now controlled by xend-relocation-ssl-server. So ssl and non-ssl relocation server can run simultaneously. You can also only start ssl server or only start non-ssl relocation server. When mix deploy xen 3.2 server (has no ssl support) and 3.3 servers, start ssl and non-ssl relocation server simultaneously can keep backward compatibility. It's also more reasonable to have separate ports for ssl and non-ssl. In this patch, also renames xend-relocation-tls to xend-relocation-ssl. Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
Diffstat (limited to 'tools/examples')
-rw-r--r--tools/examples/xend-config.sxp14
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
index 8f3b2d77c5..b6c5ceca26 100644
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
@@ -59,6 +59,7 @@
#(xend-unix-xmlrpc-server yes)
#(xend-relocation-server no)
(xend-relocation-server yes)
+#(xend-relocation-ssl-server no)
#(xend-unix-path /var/lib/xend/xend-socket)
@@ -82,15 +83,18 @@
# is set.
#(xend-relocation-port 8002)
-# Whether to use tls when relocating.
-#(xend-relocation-tls no)
+# Port xend should use for the ssl relocation interface, if
+# xend-relocation-ssl-server is set.
+#(xend-relocation-ssl-port 8003)
-# SSL key and certificate to use for the relocation interface.
-# Setting these will mean that this port serves only SSL connections as
-# opposed to plaintext ones.
+# SSL key and certificate to use for the ssl relocation interface, if
+# xend-relocation-ssl-server is set.
#(xend-relocation-server-ssl-key-file /etc/xen/xmlrpc.key)
#(xend-relocation-server-ssl-cert-file /etc/xen/xmlrpc.crt)
+# Whether to use ssl as default when relocating.
+#(xend-relocation-ssl no)
+
# Address xend should listen on for HTTP connections, if xend-http-server is
# set.
# Specifying 'localhost' prevents remote connections.