shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Added ssl_server option to OCCI server

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@891 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-10-25 22:53:35 +00:00
parent 7ead1eea0b
commit a121ab87a2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cloud/occi/etc/occi-server.conf
View File

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

8
src/cloud/occi/lib/OCCIServer.rb
View File

@ -48,7 +48,13 @@ class OCCIServer < CloudServer
super(config_file)
@config.add_configuration_value("TEMPLATE_LOCATION",template)
@base_url="http://#{@config[:server]}:#{@config[:port]}"
if @config[:ssl_server]
@base_url=@config[:ssl_server]
else
@base_url="http://#{@config[:server]}:#{@config[:port]}"
end
print_configuration
end