From 025c1fcf0a1c416205b5b0e043d3bdf9f345712c Mon Sep 17 00:00:00 2001 From: Luciano Righetti Date: Tue, 14 Jun 2022 10:40:18 +0200 Subject: [PATCH] fix: baseurl setting, db host healthcheck --- docker-compose.yml | 3 ++- web/run.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 632f2b6..82ee300 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,11 +25,12 @@ services: - MISP_BASEURL=${MISP_BASEURL} - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} - TIMEZONE=${TIMEZONE} - entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_DATABASE} -p 3306 -- /run.sh" + entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST} -p 3306 -- /run.sh" db: container_name: misp_db image: mysql/mysql-server:5.7 + hostname: ${MYSQL_HOST} restart: unless-stopped volumes: - ${DATA_DIR}/db:/var/lib/mysql diff --git a/web/run.sh b/web/run.sh index 0787f02..7320f72 100755 --- a/web/run.sh +++ b/web/run.sh @@ -103,7 +103,8 @@ if [ -r /.firstboot.tmp ]; then echo "No base URL defined, don't forget to define it manually!" else echo "Fixing the MISP base URL ($MISP_BASEURL) ..." - sed -i "s@'baseurl'[\t ]*=>[\t ]*'',@'baseurl' => '$MISP_BASEURL',@g" /var/www/MISP/app/Config/config.php + sed -i "s@'baseurl'[\t ]*=>[\t ]*'.*',@'baseurl' => '$MISP_BASEURL',@g" /var/www/MISP/app/Config/config.php + sed -i "s@'rest_client_baseurl'[\t ]*=>[\t ]*'.*',@'rest_client_baseurl' => '$MISP_BASEURL',@g" /var/www/MISP/app/Config/config.php fi #Redis should not run as a daemon