From: Brian Warner <warner@allmydata.com>
Date: Wed, 29 Oct 2008 04:34:20 +0000 (-0700)
Subject: node.py: remove support for the old BASEDIR/authorized_keys.PORT file
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=ba262398793bfa59e7f5cb7fce752f8cb532d674;p=tahoe-lafs%2Ftahoe-lafs.git

node.py: remove support for the old BASEDIR/authorized_keys.PORT file
---

diff --git a/docs/configuration.txt b/docs/configuration.txt
index 8c568bf0..d25bddd9 100644
--- a/docs/configuration.txt
+++ b/docs/configuration.txt
@@ -337,8 +337,6 @@ exists, it will take precedence over the corresponding item in tahoe.cfg .
 [node]log_gatherer.furl : BASEDIR/log_gatherer.furl (one per line)
 [node]timeout.keepalive : BASEDIR/keepalive_timeout
 [node]timeout.disconnect : BASEDIR/disconnect_timeout
-[node]ssh.port : BASEDIR/authorized_keys.SSHPORT
-[node]ssh.authorized_keys_file : BASEDIR/authorized_keys.SSHPORT
 [client]introducer.furl : BASEDIR/introducer.furl
 [client]helper.furl : BASEDIR/helper.furl
 [client]key_generator.furl : BASEDIR/key_generator.furl
@@ -352,8 +350,10 @@ exists, it will take precedence over the corresponding item in tahoe.cfg .
 Note: the functionality of [node]ssh.port and [node]ssh.authorized_keys_file
 were previously combined, controlled by the presence of a
 BASEDIR/authorized_keys.SSHPORT file, in which the suffix of the filename
-indicated which port the ssh server should listen on.
-
+indicated which port the ssh server should listen on, and the contents of the
+file provided the ssh public keys to accept. Support for these files has been
+removed completely. To ssh into your Tahoe node, add [node]ssh.port and
+[node].ssh_authorized_keys_file statements to your tahoe.cfg .
 
 == Example ==
 
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index fd5b526c..72f7588b 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -133,15 +133,6 @@ class Node(service.MultiService):
             pass
         copy("keepalive_timeout", "node", "timeout.keepalive")
         copy("disconnect_timeout", "node", "timeout.disconnect")
-        AUTHKEYSFILEBASE = "authorized_keys."
-        for f in os.listdir(self.basedir):
-            if f.startswith(AUTHKEYSFILEBASE):
-                keyfile = os.path.join(self.basedir, f)
-                portnum = int(f[len(AUTHKEYSFILEBASE):])
-                self.set_config("node", "ssh.port", str(portnum))
-                self.set_config("node", "ssh.authorized_keys_file", keyfile)
-                # only allow one
-                break
 
     def _copy_config_from_file(self, config_filename, section, keyname):
         s = self.get_config_from_file(config_filename)