From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Thu, 8 Jul 2010 11:01:24 +0000 (+0200)
Subject: new configuration format
X-Git-Tag: omf-5.3-6~3
X-Git-Url: http://git.onelab.eu/?p=omf.git;a=commitdiff_plain;h=7c2af916bff20e2186d372d570da164ecc6de952

new configuration format
---

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
index 91fd392..d49d83b 100644
--- a/omf-resctl.yaml.in
+++ b/omf-resctl.yaml.in
@@ -34,7 +34,7 @@
 ---
 :rcontroller:
   # Communication settings 
-  :comm:
+  :communicator:
 
     # Number of seconds between consecutive HEARTBEAT messages
     :heartbeat_interval: 10
@@ -42,11 +42,31 @@
     # Interface to the control network from which this resource can be controlled and managed
     :control_if: control
 
-    # Address of the local PubSub server to use for PubSub communication
-    :local_pubsub_server: @XMPP_SERVER@
+    # set this to false if you want to disable signature checks and message signing
+    :authenticate_messages: true
 
-    # Address of the remote PubSub server which host the PubSub groups for my Slice
-    :remote_pubsub_server: @XMPP_SERVER@
+    # your RSA/DSA SSH private key file
+    :private_key: @SLIVER_PRIVATE_KEY@
+
+    # directory holding the public keys of your OMF peers
+    :public_key_dir: @SLIVER_PUB_KEY_DIR@
+
+    :type: 'xmpp'
+    :xmpp:
+      # Address of the PubSub server to use as gateway for PubSub communication
+      :pubsub_gateway: @XMPP_SERVER@
+
+      # Address of the PubSub server which host the communication for my slice
+      # Leave this commented if the pubsub groups for this slice are hosted on 
+      # the same server as the 'pubsub_gateway'
+      #:pubsub_domain: 10.0.0.200
+      # The following 'home_pubsub_user' and 'home_pubsub_pwd' are optional
+      # RC will create a unique user/pwd for itself if this is not provided
+      # In a typical OMF install, you should not uncomment these lines
+      # (do so only if you need to manually set user/password for 
+      # your client to connect to your pubsub server)
+      #:pubsub_user: 'my_RC_name' 
+      #:pubsub_pwd: 'my_RC_password'
 
   # Agent settings
   :agent: