Merge branch 'naming_convention_changes' of https://github.com/Phrozyn/MozDef into naming_convention_changes

.gitignore

@@ -11,3 +11,4 @@ cron/ipblocklist.txt
 alerts/generic_alerts
 /.project
 /data
+.vscode

docs/source/installation.rst

@@ -395,7 +395,7 @@ Manual Installation
 
 *Use sudo whereever required*
 
-**(Currently only for apt-based systems)**
+**(Currently only for apt-based systems using Docker)**
 
 
 1. Cloning repository ::

mq/eventtask.ini

@@ -20,6 +20,6 @@ procname-master = [m]
 procname-prefix = [eventtask]
 master-fifo = /opt/mozdef/envs/mozdef/mq/eventtask.fifo
 never-swap
-pidfile = /var/run/mozdefmqwSyslog/eventtask.pid
+pidfile = /var/run/mozdefeventtask/eventtask.pid
 vacuum = true
 enable-threads

tests/alerts/test_ssh_key.py

@@ -5,7 +5,7 @@ from alert_test_suite import AlertTestSuite
 
 
 class TestSSHKey(AlertTestSuite):
-    alert_filename = 'sshkey'
+    alert_filename = 'ssh_key'
     alert_classname = 'SSHKey'
 
     # This event is the default positive event that will cause the