From 3eee1c88f32d541aa10e0d8fbf582b89dbf51c9b Mon Sep 17 00:00:00 2001 From: 8ear Date: Mon, 2 Sep 2019 11:44:54 +0200 Subject: [PATCH 1/3] Change Install documentation --- docs/install.md | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/install.md b/docs/install.md index f1a7469..2d6fde7 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,7 +1,21 @@ ## How to install and start MISP modules (in a Python virtualenv)? +Required Packages to install: +{!apt_package.list!} + ~~~~bash -sudo apt-get install python3-dev python3-pip libpq5 libjpeg-dev tesseract-ocr libpoppler-cpp-dev imagemagick virtualenv libopencv-dev zbar-tools libzbar0 libzbar-dev libfuzzy-dev +sudo apt-get install -y \ + git \ + libpq5 \ + libjpeg-dev \ + tesseract-ocr \ + libpoppler-cpp-dev \ + imagemagick virtualenv \ + libopencv-dev \ + zbar-tools \ + libzbar0 \ + libzbar-dev \ + libfuzzy-dev # With virtualenv: sudo -u www-data virtualenv -p python3 /var/www/MISP/venv cd /usr/local/src/ sudo git clone https://github.com/MISP/misp-modules.git @@ -17,10 +31,10 @@ pip install -I -r REQUIREMENTS pip install . # END without virtualenv -# To start after reboot: -sudo sed -i -e '$i \sudo -u www-data /var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s > /tmp/misp-modules_rc.local.log &\n' /etc/rc.local - -# Start the Module: +# Start misp-modules as a service +sudo cp etc/systemd/system/misp-modules.service /etc/systemd/system/ +sudo systemctl daemon-reload +sudo systemctl enable --now misp-modules /var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s & #to start the modules ~~~~ @@ -68,6 +82,14 @@ systemctl enable --now misp-modules ## How to use an MISP modules Docker container +### Docker build + +~~~~bash +docker build -t misp-modules \ + --build-arg BUILD_DATE=$(date -u +"%Y-%m-%d") \ + docker/ +~~~~ + ### Docker run ~~~~bash From 33f858fe977019c5a497554e9472b0118b479d10 Mon Sep 17 00:00:00 2001 From: 8ear Date: Mon, 2 Sep 2019 11:49:56 +0200 Subject: [PATCH 2/3] Fix Install.md --- docs/install.md | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/install.md b/docs/install.md index 2d6fde7..0efda30 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,8 +1,5 @@ ## How to install and start MISP modules (in a Python virtualenv)? -Required Packages to install: -{!apt_package.list!} - ~~~~bash sudo apt-get install -y \ git \ @@ -43,10 +40,20 @@ sudo systemctl enable --now misp-modules As of this writing, the official RHEL repositories only contain Ruby 2.0.0 and Ruby 2.1 or higher is required. As such, this guide installs Ruby 2.2 from the SCL repository. ~~~~bash -sudo yum install rh-ruby22 -sudo yum install openjpeg-devel -sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel gcc-c++ pkgconfig poppler-cpp-devel python-devel redhat-rpm-config -cd /var/www/MISP +sudo yum install \ + rh-ruby22 \ + openjpeg-devel \ + rubygem-rouge \ + rubygem-asciidoctor \ + zbar-devel \ + opencv-devel \ + gcc-c++ \ + pkgconfig \ + poppler-cpp-devel \ + python-devel \ + redhat-rpm-config + +cd /usr/local/src/ git clone https://github.com/MISP/misp-modules.git cd misp-modules sudo -u apache /usr/bin/scl enable rh-python36 "virtualenv -p python3 /var/www/MISP/venv" From d7bf9e4df8524d5c1b35bf3061301dfb397c102c Mon Sep 17 00:00:00 2001 From: 8ear Date: Mon, 2 Sep 2019 11:56:04 +0200 Subject: [PATCH 3/3] Fixing Install.md --- docs/install.md | 54 ++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/docs/install.md b/docs/install.md index 0efda30..72cf9d6 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,31 +1,37 @@ ## How to install and start MISP modules (in a Python virtualenv)? ~~~~bash +SUDO_WWW="sudo -u www-data" + sudo apt-get install -y \ - git \ - libpq5 \ - libjpeg-dev \ - tesseract-ocr \ - libpoppler-cpp-dev \ - imagemagick virtualenv \ - libopencv-dev \ - zbar-tools \ - libzbar0 \ - libzbar-dev \ - libfuzzy-dev -# With virtualenv: sudo -u www-data virtualenv -p python3 /var/www/MISP/venv + git \ + libpq5 \ + libjpeg-dev \ + tesseract-ocr \ + libpoppler-cpp-dev \ + imagemagick virtualenv \ + libopencv-dev \ + zbar-tools \ + libzbar0 \ + libzbar-dev \ + libfuzzy-dev + +# BEGIN with virtualenv: +$SUDO_WWW virtualenv -p python3 /var/www/MISP/venv +# END with virtualenv + cd /usr/local/src/ sudo git clone https://github.com/MISP/misp-modules.git cd misp-modules # BEGIN with virtualenv: -sudo -u www-data /var/www/MISP/venv/bin/pip install -I -r REQUIREMENTS -sudo -u www-data /var/www/MISP/venv/bin/pip install . +$SUDO_WWW /var/www/MISP/venv/bin/pip install -I -r REQUIREMENTS +$SUDO_WWW /var/www/MISP/venv/bin/pip install . # END with virtualenv # BEGIN without virtualenv: -pip install -I -r REQUIREMENTS -pip install . +sudo pip install -I -r REQUIREMENTS +sudo pip install . # END without virtualenv # Start misp-modules as a service @@ -40,6 +46,7 @@ sudo systemctl enable --now misp-modules As of this writing, the official RHEL repositories only contain Ruby 2.0.0 and Ruby 2.1 or higher is required. As such, this guide installs Ruby 2.2 from the SCL repository. ~~~~bash +SUDO_WWW="sudo -u apache" sudo yum install \ rh-ruby22 \ openjpeg-devel \ @@ -52,13 +59,12 @@ sudo yum install \ poppler-cpp-devel \ python-devel \ redhat-rpm-config - cd /usr/local/src/ -git clone https://github.com/MISP/misp-modules.git +sudo git clone https://github.com/MISP/misp-modules.git cd misp-modules -sudo -u apache /usr/bin/scl enable rh-python36 "virtualenv -p python3 /var/www/MISP/venv" -sudo -u apache /var/www/MISP/venv/bin/pip install -U -I -r REQUIREMENTS -sudo -u apache /var/www/MISP/venv/bin/pip install -U . +$SUDO_WWW /usr/bin/scl enable rh-python36 "virtualenv -p python3 /var/www/MISP/venv" +$SUDO_WWW /var/www/MISP/venv/bin/pip install -U -I -r REQUIREMENTS +$SUDO_WWW /var/www/MISP/venv/bin/pip install -U . ~~~~ Create the service file /etc/systemd/system/misp-modules.service : @@ -120,6 +126,12 @@ services: misp-modules: # https://hub.docker.com/r/dcso/misp-dockerized-misp-modules image: dcso/misp-dockerized-misp-modules:3 + + # Local image: + #image: misp-modules + #build: + # context: docker/ + environment: # Redis REDIS_BACKEND: misp-redis