diff options
| author | Rob Austein <sra@hactrn.net> | 2010-04-29 21:00:41 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-04-29 21:00:41 +0000 |
| commit | c19bd5639131a1bceb6d30f132bda3a115b805d4 (patch) | |
| tree | b7ac174f8168ef2bb7f5b5e8caa0a525ee87f8c9 | |
| parent | 32da413c226a08c9b6ecadb7066c3299636317a8 (diff) | |
Cleanup
svn path=/rtr-origin/rtr-origin.py; revision=3227
| -rw-r--r-- | rtr-origin/rtr-origin.py | 5 | ||||
| -rwxr-xr-x | rtr-origin/server.sh | 2 | ||||
| -rw-r--r-- | rtr-origin/sshd.conf | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/rtr-origin/rtr-origin.py b/rtr-origin/rtr-origin.py index 8b8cd090..12ecca24 100644 --- a/rtr-origin/rtr-origin.py +++ b/rtr-origin/rtr-origin.py @@ -804,8 +804,6 @@ class client_channel(pdu_channel): timer = None - debug_using_direct_server_subprocess = True - def __init__(self, sock, proc, killsig): self.killsig = killsig self.proc = proc @@ -1176,8 +1174,9 @@ if mode is None: tag = mode +rpki.log.use_syslog = mode in ("cronjob", "server") + if mode == "server": - rpki.log.use_syslog = True # # Try to figure out peer address when we're in server mode. try: diff --git a/rtr-origin/server.sh b/rtr-origin/server.sh index a91aa925..7ccf2f38 100755 --- a/rtr-origin/server.sh +++ b/rtr-origin/server.sh @@ -14,4 +14,4 @@ cd /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin -exec /usr/local/bin/python rtr-origin.py --server 2>> /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/server.log +exec /usr/local/bin/python rtr-origin.py --server diff --git a/rtr-origin/sshd.conf b/rtr-origin/sshd.conf index c6243cbb..0124fc4c 100644 --- a/rtr-origin/sshd.conf +++ b/rtr-origin/sshd.conf @@ -11,7 +11,7 @@ ListenAddress ::1 HostKey /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/ssh_host_rsa_key PermitRootLogin no PubkeyAuthentication yes -#AuthorizedKeysFile /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/authorized_keys +AuthorizedKeysFile /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/authorized_keys PasswordAuthentication no PermitEmptyPasswords no ChallengeResponseAuthentication no @@ -21,4 +21,3 @@ X11Forwarding no UseDNS no PidFile /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/sshd.pid Subsystem rpki-rtr /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin/server.sh -#Subsystem sftp /usr/libexec/sftp-server |