Added ssl_server configuration value for econe api server

git-svn-id: http://svn.opennebula.org/one/trunk@892 3034c82b-c49b-4eb3-8279-a7acafdc01c0

src/cloud/ec2/etc/econe.conf

@@ -9,6 +9,9 @@ ONE_XMLRPC=http://localhost:2633/RPC2
 SERVER=<PUT HERE FQDN OF SERVER>
 PORT=4567
 
+# SSL proxy that serves the API (set if is being used)
+#SSL_SERVER=fqdm.of.the.server
+
 # Configuration for the image repository
 DATABASE=<PUT HERE ONELOCATION/var/econe.db
 IMAGE_DIR=<PUT HERE PATH TO EXISTING IMAGE DIRECTORY>

src/cloud/ec2/lib/EC2QueryServer.rb

@@ -63,6 +63,12 @@ class EC2QueryServer < CloudServer
         super(config_file)
         @config.add_configuration_value("TEMPLATE_LOCATION",template)
         @config.add_configuration_value("VIEWS",views)
+        
+        if @config[:ssl_server]
+            @server_host=@config[:ssl_server]
+        else
+            @server_host=@config[:server]
+        end
 
         print_configuration
     end
@@ -83,7 +89,7 @@ class EC2QueryServer < CloudServer
 
         signature = AWS.encode(
                        user[:password], 
-                       AWS.canonical_string(signature_params, @config[:server]),
+                       AWS.canonical_string(signature_params, @server_host),
                        false)
         
         return params['Signature']==signature