From fa155dda8734a67ef3e00bf8a1b98b4e06e97af3 Mon Sep 17 00:00:00 2001 From: Vaishno Chaitanya Date: Thu, 30 Jun 2022 20:40:01 +0530 Subject: [PATCH 1/6] #150 Fix: Added default values for failover. --- docker-compose.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 82ee300..d964843 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,26 +16,26 @@ services: - /dev/urandom:/dev/random - ${DATA_DIR}/web:/var/www/MISP environment: - - MYSQL_HOST=${MYSQL_HOST} - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL} - - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE} - - MISP_BASEURL=${MISP_BASEURL} - - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} - - TIMEZONE=${TIMEZONE} - entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST} -p 3306 -- /run.sh" + - MYSQL_HOST=${MYSQL_HOST:-misp_db} + - MYSQL_DATABASE=${MYSQL_DATABASE:-misp} + - MYSQL_USER=${MYSQL_USER:-misp} + - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp} + - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL:-admin@admin.test} + - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin} + - MISP_BASEURL=${MISP_BASEURL:-https://localhost} + - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn} + - TIMEZONE=${TIMEZONE:-Asia/Calcutta} + entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh" db: container_name: misp_db image: mysql/mysql-server:5.7 - hostname: ${MYSQL_HOST} + hostname: ${MYSQL_HOST:-misp_db} restart: unless-stopped volumes: - ${DATA_DIR}/db:/var/lib/mysql environment: - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE:-misp} + - MYSQL_USER=${MYSQL_USER:-misp} + - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} From 8674e077f566bdddb225719c1c93424c8fa8582a Mon Sep 17 00:00:00 2001 From: Vaishno Chaitanya Date: Thu, 30 Jun 2022 21:22:53 +0530 Subject: [PATCH 2/6] #150 Fix: Line #41 added fallback value. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d964843..79b6bbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,4 +38,4 @@ services: - MYSQL_DATABASE=${MYSQL_DATABASE:-misp} - MYSQL_USER=${MYSQL_USER:-misp} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-misp} From 8a2a33f2f29b9808d728adbbc3c39f8d0d575058 Mon Sep 17 00:00:00 2001 From: Vaishno Chaitanya Date: Fri, 1 Jul 2022 12:44:25 +0530 Subject: [PATCH 3/6] Added fallback value for DATA_DIR env. --- docker-compose.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 79b6bbf..ebfb92a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro - /dev/urandom:/dev/random - - ${DATA_DIR}/web:/var/www/MISP + - ${DATA_DIR:-./data}/web:/var/www/MISP environment: - MYSQL_HOST=${MYSQL_HOST:-misp_db} - MYSQL_DATABASE=${MYSQL_DATABASE:-misp} @@ -33,9 +33,13 @@ services: hostname: ${MYSQL_HOST:-misp_db} restart: unless-stopped volumes: - - ${DATA_DIR}/db:/var/lib/mysql + - ${DATA_DIR:-./data}/db:/var/lib/mysql environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-misp} - MYSQL_USER=${MYSQL_USER:-misp} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-misp} + +volumes: + web: + db: From 168f4d687e9d2501e53946e99dee787d570a8c1f Mon Sep 17 00:00:00 2001 From: Vaishno Chaitanya Date: Sun, 10 Jul 2022 22:32:37 +0530 Subject: [PATCH 4/6] Updated TIMEZONE --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ebfb92a..bf678e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin} - MISP_BASEURL=${MISP_BASEURL:-https://localhost} - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn} - - TIMEZONE=${TIMEZONE:-Asia/Calcutta} + - TIMEZONE=${TIMEZONE:-Europe/Brussels} entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh" db: From fa5218708bef05b676ff2ba4b10c029cb1e6dde2 Mon Sep 17 00:00:00 2001 From: Vaishno Chaitanya Date: Mon, 11 Jul 2022 11:30:24 +0530 Subject: [PATCH 5/6] Default TIMEZONE value changed to UTC --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bf678e8..3c2f991 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin} - MISP_BASEURL=${MISP_BASEURL:-https://localhost} - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn} - - TIMEZONE=${TIMEZONE:-Europe/Brussels} + - TIMEZONE=${TIMEZONE:-UTC} entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh" db: From b1b05107a78fdd06b8a5a12664b61424ee42dbce Mon Sep 17 00:00:00 2001 From: Luciano Righetti Date: Wed, 27 Jul 2022 14:13:45 +0200 Subject: [PATCH 6/6] fix: run misp-modules and workers as www-data --- web/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/Dockerfile b/web/Dockerfile index 342f344..f2733b2 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -59,11 +59,13 @@ RUN ( \ echo 'command=/bin/bash /var/www/MISP/app/Console/worker/start.sh'; \ echo 'startsecs = 0'; \ echo 'autorestart = false'; \ + echo 'user=www-data'; \ echo ''; \ echo '[program:misp-modules]'; \ echo 'command=/bin/bash -c "/var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s"'; \ echo 'startsecs = 0'; \ echo 'autorestart = false'; \ + echo 'user=www-data'; \ ) >> /etc/supervisor/conf.d/supervisord.conf # Add run script