Merge branch 'MISP:master' into hotfix/build-error-on-m1-mac

Fukusuke Takahashi 2022-07-03 09:13:58 +09:00 committed by GitHub
commit a9fbd035bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

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 db -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

View File

@ -6,7 +6,7 @@ MYSQL_ROOT_PASSWORD=misp
MISP_ADMIN_EMAIL=admin@admin.test MISP_ADMIN_EMAIL=admin@admin.test
MISP_ADMIN_PASSPHRASE=admin MISP_ADMIN_PASSPHRASE=admin
MISP_BASEURL=localhost MISP_BASEURL=https://localhost
POSTFIX_RELAY_HOST=relay.fqdn POSTFIX_RELAY_HOST=relay.fqdn
TIMEZONE=Europe/Brussels TIMEZONE=Europe/Brussels

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