dos2unix'ed

diff --git a/omf-resctl.yaml.in b/omf-resctl.yaml.in
index 3c1d7ad..8f79701 100644 (file)
--- a/omf-resctl.yaml.in
+++ b/omf-resctl.yaml.in
@@ -1,77 +1,77 @@
-#\r
-# This is the template Config file for the OMF Resource Controller\r
-# The uppercase symbols between '@' get filled by the Nodemanager 'omf_resctl' plugin \r
-#\r
-# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia\r
-#\r
-# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA\r
-#\r
-# Permission is hereby granted, free of charge, to any person obtaining a copy\r
-# of this software and associated documentation files (the "Software"), to deal\r
-# in the Software without restriction, including without limitation the rights\r
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-# copies of the Software, and to permit persons to whom the Software is\r
-# furnished to do so, subject to the following conditions:\r
-#\r
-# The above copyright notice and this permission notice shall be included in\r
-# all copies or substantial portions of the Software.\r
-#\r
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\r
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-# THE SOFTWARE.\r
-#\r
-#\r
-# NOTE: use only 'spaces' to indent !\r
-# ('tab' indents are not supported by the ruby yaml parser used to read this file)\r
-#\r
----\r
-:rcontroller:\r
-  # Communication settings \r
-  :communicator:\r
-\r
-    # Number of seconds between consecutive HEARTBEAT messages\r
-    :heartbeat_interval: 10\r
-  \r
-    # Interface to the control network from which this resource can be controlled and managed\r
-    :control_if: control\r
-\r
-    # set this to false if you want to disable signature checks and message signing\r
-    :authenticate_messages: true\r
-\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
-    # Name (i.e. unique HRN ID) of this resource\r
-    # Or this could also be passed as a command line parameter "--name"\r
-    # Or if set to 'default', then the RC will use the output of '/bin/hostname'\r
-    :name: @NODE_HRN@\r
-\r
-    # Name (i.e. unique HRN ID) of the slice to which this resource is assigned\r
-    :slice: @SLICE_NAME@\r
+#
+# This is the template Config file for the OMF Resource Controller
+# The uppercase symbols between '@' get filled by the Nodemanager 'omf_resctl' plugin 
+#
+# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+#
+# NOTE: use only 'spaces' to indent !
+# ('tab' indents are not supported by the ruby yaml parser used to read this file)
+#
+---
+:rcontroller:
+  # Communication settings 
+  :communicator:
+
+    # Number of seconds between consecutive HEARTBEAT messages
+    :heartbeat_interval: 10
+  
+    # Interface to the control network from which this resource can be controlled and managed
+    :control_if: control
+
+    # set this to false if you want to disable signature checks and message signing
+    :authenticate_messages: true
+
+    # 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:
+
+    # Name (i.e. unique HRN ID) of this resource
+    # Or this could also be passed as a command line parameter "--name"
+    # Or if set to 'default', then the RC will use the output of '/bin/hostname'
+    :name: @NODE_HRN@
+
+    # Name (i.e. unique HRN ID) of the slice to which this resource is assigned
+    :slice: @SLICE_NAME@