Merge branch 'desaster-master'

.gitignore

@@ -6,61 +6,15 @@ data/ssh_host_dsa_key.pub
 data/ssh_host_rsa_key
 data/ssh_host_rsa_key.pub
 dl/*
-log/kippo.log
+log/kippo.log*
 log/tty/*
+kippo-textlog.log
 private.key
 public.key
 
-# Created by .gitignore support plugin (hsz.mobi)
-
-### Python template
-# Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
 env/
-build/
-develop-eggs/
-dist/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-*.pot
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
+env1/
+env2/

README.md

@@ -1,3 +1,5 @@
+NOTE: For more recent development, check out [Michel Oosterhof's fork](https://github.com/micheloosterhof/cowrie)
+
 # Kippo
 
 Kippo is a medium interaction SSH honeypot designed to log brute force attacks and, most importantly, the entire shell interaction performed by the attacker.
@@ -44,7 +46,7 @@ start.sh is a simple shell script that runs Kippo in the background using twistd
 
 `twistd -y kippo.tac -n`
 
-By default Kippo listens for ssh connections on port 2222. You can change this, but do not change it to 22 as it requires root privileges. Use port forwarding instead. (More info: MakingKippoReachable).
+By default Kippo listens for ssh connections on port 2222. You can change this, but do not change it to 22 as it requires root privileges. Use port forwarding instead. (More info: [MakingKippoReachable](https://github.com/desaster/kippo/wiki/Making-Kippo-Reachable)).
 
 Files of interest: