Merge pull request #386 from wettenhj/sftp-fixes

Minor bug fixes
mytardis · Feb 15, 2015 · c29950f · c29950f
2 parents 8f9356c + c74ffc0
commit c29950f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tardis/tardis_portal/management/commands/sftpd.py b/tardis/tardis_portal/management/commands/sftpd.py
@@ -21,9 +21,9 @@ class Command(BaseCommand):
                     action='store',
                     type='int',
                     dest='port',
-                    default=getattr(settings, 'SFTPD_PORT', 2200),
+                    default=getattr(settings, 'SFTP_PORT', 2200),
                     help='Port to listen on, default: 2200'),
     )
 
     def handle(self, *args, **kwargs):
-        sftp.start_server(host=kwargs['host'])
+        sftp.start_server(host=kwargs['host'], port=kwargs['port'])
diff --git a/tardis/tardis_portal/sftp.py b/tardis/tardis_portal/sftp.py
@@ -430,9 +430,9 @@ def start_server(host=None, port=None, keyfile=None):
     if host is None:
         current_site = Site.objects.get_current()
         host = current_site.domain
-    port = port or getattr(settings, 'SFTPD_PORT', 2200)
+    port = port or getattr(settings, 'SFTP_PORT', 2200)
     host_key_string = getattr(
-        settings, 'SFTPD_HOST_KEY',
+        settings, 'SFTP_HOST_KEY',
         "-----BEGIN RSA PRIVATE KEY-----\n"
         "MIICXgIBAAKCAIEAl7sAF0x2O/HwLhG68b1uG8KHSOTqe3Cdlj5i/1RhO7E2BJ4B\n"
         "3jhKYDYtupRnMFbpu7fb21A24w3Y3W5gXzywBxR6dP2HgiSDVecoDg2uSYPjnlDk\n"