From df4774562bc002b76c85fe6b939017e89008cd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Thu, 22 Sep 2011 15:29:05 +0200
Subject: [PATCH] Feature #795: Add comments to occi-server.conf, leave the
 bridge unset by default

---
 src/cloud/occi/etc/occi-server.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf
index ec74643b19..2bf8516b9f 100644
--- a/src/cloud/occi/etc/occi-server.conf
+++ b/src/cloud/occi/etc/occi-server.conf
@@ -17,7 +17,7 @@
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 
-# Host and port where econe server will run
+# Host and port where OCCI server will run
 :server: localhost
 :port: 4567
 
@@ -25,9 +25,11 @@
 #:ssl_server: fqdm.of.the.server
 
 # Configuration for OpenNebula's Virtual Networks
-#:bridge: <NAME_OF_DEFAULT_BRIDGE>
-:bridge: vbr1
+#:bridge: NAME_OF_DEFAULT_BRIDGE
 
+# Authentication protocol for the OCCI server:
+#   basic, for OpenNebula's user-password scheme
+#   x509, for x509 certificates based authentication
 :auth: basic
 
 # VM types allowed and its template file (inside templates directory)