From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 12 Sep 2012 20:29:56 +0000 (-0400)
Subject: modified variable name
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=621e8358901b183d0cdc9ac225a947e137908293;p=plcapi.git

modified variable name
---

diff --git a/Server.py b/Server.py
index fe4a8b4..fad4bb9 100755
--- a/Server.py
+++ b/Server.py
@@ -68,7 +68,7 @@ class App:
 # Defaults
 addr = "0.0.0.0"
 port = 8000
-config = '/etc/planetlab/plc_config'
+config_file = '/etc/planetlab/plcapi_config'
 keyfile=None
 certfile=None
 
@@ -94,11 +94,14 @@ if options.config:
     addr = config
     keyfile = config.api_ssl_key_file
     certfile = config.api_ssl_cert_file 
-    
+else:
+    config = Config(config_file)    
 
 if options.port:
     port = int(options.port)
 
+#api=API(config)
+ 
 # Start server
 if keyfile and certfile:
     server = pywsgi.WSGIServer((addr, port), App(), keyfile=keyfile, certfile=certfile)