← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to daemons/sftp.tac

Merge extract-ssh-server-auth

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemons/sftp.tac
11
11
from canonical.launchpad.daemons import tachandler
12
12
 
13
13
from lp.codehosting.sshserver.daemon import (
14
 
    get_key_path, make_portal, PRIVATE_KEY_FILE, PUBLIC_KEY_FILE)
 
14
    ACCESS_LOG_NAME, get_key_path, LOG_NAME, make_portal, OOPS_CONFIG_SECTION,
 
15
    PRIVATE_KEY_FILE, PUBLIC_KEY_FILE)
15
16
from lp.services.sshserver.service import SSHService
16
17
 
17
18
 
21
22
    portal=make_portal(),
22
23
    private_key_path=get_key_path(PRIVATE_KEY_FILE),
23
24
    public_key_path=get_key_path(PUBLIC_KEY_FILE),
 
25
    oops_configuration=OOPS_CONFIG_SECTION,
 
26
    main_log=LOG_NAME,
 
27
    access_log=ACCESS_LOG_NAME,
 
28
    access_log_path=config.codehosting.access_log,
24
29
    strport=config.codehosting.port,
25
30
    idle_timeout=config.codehosting.idle_timeout,
26
31
    banner=config.codehosting.banner)