mirror of https://github.com/MISP/misp-docker
Merge branch 'MISP:master' into hotfix/build-error-on-m1-mac
commit
a9fbd035bf
|
@ -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 db -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
|
||||
|
|
|
@ -6,7 +6,7 @@ MYSQL_ROOT_PASSWORD=misp
|
|||
|
||||
MISP_ADMIN_EMAIL=admin@admin.test
|
||||
MISP_ADMIN_PASSPHRASE=admin
|
||||
MISP_BASEURL=localhost
|
||||
MISP_BASEURL=https://localhost
|
||||
|
||||
POSTFIX_RELAY_HOST=relay.fqdn
|
||||
TIMEZONE=Europe/Brussels
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue