[svn] commit: r677 - /branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py.in

[BIND 10 source code commits]

Author: jelte
Date: Sat Jan 30 00:49:16 2010
New Revision: 677

Log:
also use the correct certificate file

Modified:
    branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py.in

Modified: branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py.in
==============================================================================
--- branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py.in (original)
+++ branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py.in Sat Jan 30 00:49:16 2010
@@ -45,8 +45,6 @@
     import dummy_threading as threading
 
 URL_PATTERN = re.compile('/([\w]+)(?:/([\w]+))?/?')
-USER_INFO_FILE = "passwd.csv"
-CERTIFICATE_FILE = 'b10-cmdctl.pem'
 
 # If B10_FROM_SOURCE is set in the environment, we use data files
 # from a directory relative to that, otherwise we use the ones
@@ -59,6 +57,7 @@
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
 SPECFILE_LOCATION = SPECFILE_PATH + "/cmdctl.spec"
 USER_INFO_FILE = SPECFILE_PATH + "/passwd.csv"
+CERTIFICATE_FILE = SPECFILE_PATH + "/b10-cmdctl.pem"
         
 class SecureHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
     '''https connection request handler.