src/mercurialserver/refreshauth.py
branchdebian
changeset 229 3a28047ec6dc
parent 213 72e7ba8b41a6
child 242 03d8f07230b3
--- a/src/mercurialserver/refreshauth.py	Wed Dec 02 17:46:28 2009 +0000
+++ b/src/mercurialserver/refreshauth.py	Wed Dec 02 17:48:40 2009 +0000
@@ -10,13 +10,13 @@
 import os
 import os.path
 import subprocess
-from mercurialserver import paths
+from mercurialserver import config
 
 goodkey = re.compile("[/A-Za-z0-9._-]+$")
 
 def refreshAuth():
-    akeyfile = os.path.expanduser("~/.ssh/authorized_keys")
-    wrappercommand = paths.getExePath() + "/hg-ssh"
+    akeyfile = config.getAuthorizedKeysPath()
+    wrappercommand = config.getExePath() + "/hg-ssh"
     prefix='no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command='
 
     if os.path.exists(akeyfile):
@@ -29,7 +29,7 @@
             f.close()
 
     akeys = open(akeyfile + "_new", "w")
-    for keyroot in paths.getKeysPaths():
+    for keyroot in config.getKeysPaths():
         kr = keyroot + "/"
         #print "Processing keyroot", keyroot
         for root, dirs, files in os.walk(keyroot):