Move vidyo cron script and dependencies into mozdef-deprecated

mozilla · Jun 3, 2019 · d294b00 · d294b00
1 parent cea008a
commit d294b00
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 221 deletions.
diff --git a/cloudy_mozdef/packer/packer.json b/cloudy_mozdef/packer/packer.json
@@ -50,7 +50,7 @@
         "set -e",
         "sudo yum update -y",
         "sudo yum makecache fast",
-        "sudo yum install -y glibc-devel gcc libstdc++ libffi-devel zlib-devel make mysql-devel python python-devel python-pip git docker python3",
+        "sudo yum install -y glibc-devel gcc libstdc++ libffi-devel zlib-devel make python python-devel python-pip git docker python3",
         "sudo pip install virtualenv docker-compose",
         "sudo systemctl enable docker",
         "sudo systemctl start docker",

diff --git a/cron/vidyo2MozDef.conf b/cron/vidyo2MozDef.conf
diff --git a/cron/vidyo2MozDef.py b/cron/vidyo2MozDef.py
diff --git a/cron/vidyo2MozDef.sh b/cron/vidyo2MozDef.sh
diff --git a/docker/compose/mozdef_base/Dockerfile b/docker/compose/mozdef_base/Dockerfile
@@ -14,15 +14,14 @@ RUN \
                   libffi-devel \
                   zlib-devel \
                   libcurl-devel \
-                  openssl \ 
+                  openssl \
                   openssl-devel \
                   git \
                   make && \
   useradd -ms /bin/bash -d /opt/mozdef -m mozdef && \
   mkdir /opt/mozdef/envs && \
   cd /opt/mozdef && \
-  yum install -y mysql-devel \
-                    python \
+  yum install -y python \
                     python-devel \
                     python-pip && \
   yum clean all && \

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -70,11 +70,11 @@ We need to install a python2.7 virtualenv.
 
 On Yum-based systems::
 
-  sudo yum install make zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel pcre-devel gcc gcc-c++ mysql-devel
+  sudo yum install make zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel pcre-devel gcc gcc-c++
 
 On APT-based systems::
 
-  sudo apt-get install make zlib1g-dev libbz2-dev libssl-dev libncurses5-dev libsqlite3-dev libreadline-dev tk-dev libpcre3-dev libpcre++-dev build-essential g++ libmysqlclient-dev
+  sudo apt-get install make zlib1g-dev libbz2-dev libssl-dev libncurses5-dev libsqlite3-dev libreadline-dev tk-dev libpcre3-dev libpcre++-dev build-essential g++
 
 Then::
 

diff --git a/requirements.txt b/requirements.txt
@@ -33,7 +33,6 @@ kombu==4.1.0
 meld3==1.0.2
 mozdef-client==1.0.11
 mozdef-util==1.0.8
-MySQL-python==1.2.5
 netaddr==0.7.1
 nose==1.3.7
 oauth2client==1.4.12