From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 12 Sep 2012 20:10:33 +0000 (-0400)
Subject: checking in
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e9ffac718ee13bf24d8c767f23a15da3b01db102;p=plcapi.git

checking in
---

diff --git a/Server.py b/Server.py
index 685565f1..fe4a8b42 100755
--- a/Server.py
+++ b/Server.py
@@ -92,8 +92,8 @@ except:
 if options.config:
     config = Config(options.config)
     addr = config
-    keyfile = config.ssl_key_file
-    certfile = config.ssl_cert_file 
+    keyfile = config.api_ssl_key_file
+    certfile = config.api_ssl_cert_file 
     
 
 if options.port:
diff --git a/config/default_config b/config/default_config
new file mode 100644
index 00000000..0522125d
--- /dev/null
+++ b/config/default_config
@@ -0,0 +1,12 @@
+[api]
+host="localhost"
+port=8000
+ssl_key_file=None
+ssl_cert_file=None
+
+[nova]
+admin_user="admin"
+admin_password="admin"
+admin_tenant="admin"
+
+