new configuration format

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
index 91fd392..d49d83b 100644 (file)
--- a/omf-resctl.yaml.in
+++ b/omf-resctl.yaml.in
@@ -34,7 +34,7 @@
 ---\r
 :rcontroller:\r
   # Communication settings \r
 ---\r
 :rcontroller:\r
   # Communication settings \r

-  :comm:\r
+  :communicator:\r

 \r
     # Number of seconds between consecutive HEARTBEAT messages\r
     :heartbeat_interval: 10\r
 \r
     # Number of seconds between consecutive HEARTBEAT messages\r
     :heartbeat_interval: 10\r


@@ -42,11 +42,31 @@
     # Interface to the control network from which this resource can be controlled and managed\r
     :control_if: control\r
 \r
     # Interface to the control network from which this resource can be controlled and managed\r
     :control_if: control\r
 \r

-    # Address of the local PubSub server to use for PubSub communication\r
-    :local_pubsub_server: @XMPP_SERVER@\r
+    # set this to false if you want to disable signature checks and message signing\r
+    :authenticate_messages: true\r

 \r
 \r

-    # Address of the remote PubSub server which host the PubSub groups for my Slice\r
-    :remote_pubsub_server: @XMPP_SERVER@\r
+    # your RSA/DSA SSH private key file\r
+    :private_key: @SLIVER_PRIVATE_KEY@\r
+\r
+    # directory holding the public keys of your OMF peers\r
+    :public_key_dir: @SLIVER_PUB_KEY_DIR@\r
+\r
+    :type: 'xmpp'\r
+    :xmpp:\r
+      # Address of the PubSub server to use as gateway for PubSub communication\r
+      :pubsub_gateway: @XMPP_SERVER@\r
+\r
+      # Address of the PubSub server which host the communication for my slice\r
+      # Leave this commented if the pubsub groups for this slice are hosted on \r
+      # the same server as the 'pubsub_gateway'\r
+      #:pubsub_domain: 10.0.0.200\r
+      # The following 'home_pubsub_user' and 'home_pubsub_pwd' are optional\r
+      # RC will create a unique user/pwd for itself if this is not provided\r
+      # In a typical OMF install, you should not uncomment these lines\r
+      # (do so only if you need to manually set user/password for \r
+      # your client to connect to your pubsub server)\r
+      #:pubsub_user: 'my_RC_name' \r
+      #:pubsub_pwd: 'my_RC_password'\r

 \r
   # Agent settings\r
   :agent:\r
 \r
   # Agent settings\r
   :agent:\r