MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #151 from righel/fix-db-host-misp-baseurl 

fix: baseurl setting, db host healthcheck
Luciano Righetti 2022-06-14 10:42:49 +02:00 committed by GitHub
parent 09194b677c 025c1fcf0a
commit c15e1617ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -25,11 +25,12 @@ services:
- MISP_BASEURL=${MISP_BASEURL} - MISP_BASEURL=${MISP_BASEURL}
- POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST}
- TIMEZONE=${TIMEZONE} - 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: db:
container_name: misp_db container_name: misp_db
image: mysql/mysql-server:5.7 image: mysql/mysql-server:5.7
hostname: ${MYSQL_HOST}
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ${DATA_DIR}/db:/var/lib/mysql - ${DATA_DIR}/db:/var/lib/mysql

3
web/run.sh
View File

@ -103,7 +103,8 @@ if [ -r /.firstboot.tmp ]; then
echo "No base URL defined, don't forget to define it manually!" echo "No base URL defined, don't forget to define it manually!"
else else
echo "Fixing the MISP base URL ($MISP_BASEURL) ..." 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 fi
#Redis should not run as a daemon #Redis should not run as a daemon