From 17e9571dc0889317b1ccb9eab2e5aaf880c790eb Mon Sep 17 00:00:00 2001
From: Temur Maisuradze <temur@grena.ge>
Date: Wed, 13 Jan 2021 18:01:14 +0400
Subject: [PATCH] stop, restart and update-config scripts for misp

---
 roles/build/templates/misp/Dockerfile.j2 |  2 +-
 roles/misp/tasks/config.yml              |  5 ++++-
 roles/misp/tasks/main.yml                | 10 +++++++++-
 roles/misp/tasks/restart.yml             | 16 ++++++++++++++++
 roles/misp/tasks/update-config.yml       |  2 ++
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 roles/misp/tasks/restart.yml
 create mode 100644 roles/misp/tasks/update-config.yml

diff --git a/roles/build/templates/misp/Dockerfile.j2 b/roles/build/templates/misp/Dockerfile.j2
index e8637f8..85c9648 100644
--- a/roles/build/templates/misp/Dockerfile.j2
+++ b/roles/build/templates/misp/Dockerfile.j2
@@ -2,7 +2,7 @@ FROM {{repo}}/centos:{{version}}{{suffix}}
 
 USER root
 RUN yum install -y epel-release centos-release-scl scl-utils ; \
-    yum install -y gcc git zip openssl supervisor rh-git218 httpd24 mod_ssl mod_auth_openidc rh-redis32 libxslt-devel zlib-devel libcaca-devel ssdeep-devel rh-php72 rh-php72-php-fpm rh-php72-php-devel rh-php72-php-mysqlnd rh-php72-php-mbstring rh-php72-php-xml rh-php72-php-bcmath rh-php72-php-opcache rh-php72-php-gd mariadb devtoolset-7 make cmake3 cppcheck libcxx-devel gpgme-devel openjpeg-devel gcc gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel wget screen rh-python36-mod_wsgi postfix curl make cmake python3 python3-devel python3-pip python3-yara python3-wheel python3-redis python3-zmq python3-setuptools redis sudo vim zip sqlite moreutils rng-tools libxml2-devel libxslt-devel zlib-devel libpqxx openjpeg2-devel ssdeep-devel ruby asciidoctor tesseract ImageMagick poppler-cpp-devel python36-virtualenv opencv-devel zbar zbar-devel ; \
+    yum install -y gcc git zip openssl supervisor rsync rh-git218 httpd24 mod_ssl mod_auth_openidc rh-redis32 libxslt-devel zlib-devel libcaca-devel ssdeep-devel rh-php72 rh-php72-php-fpm rh-php72-php-devel rh-php72-php-mysqlnd rh-php72-php-mbstring rh-php72-php-xml rh-php72-php-bcmath rh-php72-php-opcache rh-php72-php-gd mariadb devtoolset-7 make cmake3 cppcheck libcxx-devel gpgme-devel openjpeg-devel gcc gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel wget screen rh-python36-mod_wsgi postfix curl make cmake python3 python3-devel python3-pip python3-yara python3-wheel python3-redis python3-zmq python3-setuptools redis sudo vim zip sqlite moreutils rng-tools libxml2-devel libxslt-devel zlib-devel libpqxx openjpeg2-devel ssdeep-devel ruby asciidoctor tesseract ImageMagick poppler-cpp-devel python36-virtualenv opencv-devel zbar zbar-devel ; \
     yum -y clean all ; \
     sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/opt/rh/rh-php72/php.ini ; \
     sed -i "s/memory_limit = 128M/memory_limit = 2048M/" /etc/opt/rh/rh-php72/php.ini ; \
diff --git a/roles/misp/tasks/config.yml b/roles/misp/tasks/config.yml
index 4ceec76..bce8637 100644
--- a/roles/misp/tasks/config.yml
+++ b/roles/misp/tasks/config.yml
@@ -65,4 +65,7 @@
     - cacheFeed
 
 - name: Set Autostart for supervisord's services
-  shell: "sed -i 's/autostart=false/autostart=true/g' /etc/supervisord.conf"
+  replace:
+    path: /etc/supervisord.conf
+    regexp: '^autostart=false$'
+    replace: 'autostart=true'
diff --git a/roles/misp/tasks/main.yml b/roles/misp/tasks/main.yml
index 8dbeed3..9b53c6c 100644
--- a/roles/misp/tasks/main.yml
+++ b/roles/misp/tasks/main.yml
@@ -8,4 +8,12 @@
    - start
    - config
 - include: stop.yml
-  tags: stop
\ No newline at end of file
+  tags: stop
+- include: update-config.yml
+  tags:
+   - update-config
+   - update-misp-config
+- include: restart.yml
+  tags:
+   - restart
+   - restart-misp
diff --git a/roles/misp/tasks/restart.yml b/roles/misp/tasks/restart.yml
new file mode 100644
index 0000000..5878940
--- /dev/null
+++ b/roles/misp/tasks/restart.yml
@@ -0,0 +1,16 @@
+---
+
+- name: Restart php-fpm
+  command: "supervisorctl restart php-fpm"
+
+- name: Restart redis-server
+  command: "supervisorctl restart redis-server"
+
+- name: Restart apache2
+  command: "supervisorctl restart apache2"
+
+- name: Restart misp-modules
+  command: "supervisorctl restart misp-modules"
+
+- name: Restart workers
+  command: "supervisorctl restart workers"
diff --git a/roles/misp/tasks/update-config.yml b/roles/misp/tasks/update-config.yml
new file mode 100644
index 0000000..cd21505
--- /dev/null
+++ b/roles/misp/tasks/update-config.yml
@@ -0,0 +1,2 @@
+---
+
-- 
GitLab