Merge branch 'master' of https://github.com/micheloosterhof/cowrie

bin/cowrie

@@ -15,7 +15,7 @@ find_cowrie_directory() {
     else
         COWRIEDIR=$(dirname $PWD/$0)/..
     fi
-    COWRIEDIR=$(cd ${COWRIEDIR} && pwd -P 2>/dev/null | pwd)
+    COWRIEDIR=$(cd ${COWRIEDIR} && pwd -P 2>/dev/null || pwd)
 }
 
 activate_venv() {

doc/sql/mysql.sql

@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `input` (
 
 CREATE TABLE IF NOT EXISTS `sensors` (
   `id` int(11) NOT NULL auto_increment,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`)
 ) ;
 

doc/sql/update11.sql

@@ -0,0 +1 @@
+ALTER TABLE sensors MODIFY ip VARCHAR(255) NOT NULL;