checking in
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 12 Sep 2012 20:10:33 +0000 (16:10 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 12 Sep 2012 20:10:33 +0000 (16:10 -0400)
Server.py
config/default_config [new file with mode: 0644]

index 685565f..fe4a8b4 100755 (executable)
--- 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 (file)
index 0000000..0522125
--- /dev/null
@@ -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"
+
+