Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coolacid/docker-misp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e641efc7aefbecdd2f7be3a44614fd0704fa2bfe
Choose a base ref
..
head repository: coolacid/docker-misp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 850fb2d150c95909b2724225e3ea60bfea2e1dae
Choose a head ref
Showing with 1 addition and 3 deletions.
  1. +1 −1 docker-compose.yml
  2. +0 −2 server/files/entrypoint_nginx.sh
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ services:
- "REDIS_FQDN=redis"
- "INIT=true" # Initialze MISP, things includes, attempting to import SQL and the Files DIR
- "CRON_USER_ID=1" # The MISP user ID to run cron jobs as
- "SYNCSERVERS=1 2" # The MISP Feed servers to sync in the cron job
# - "SYNCSERVERS=1 2 3 4" # The MISP Feed servers to sync in the cron job
# Database Configuration (And their defaults)
# - "MYSQL_HOST=db"
# - "MYSQL_USER=misp"
2 changes: 0 additions & 2 deletions server/files/entrypoint_nginx.sh
View file
Original file line number Diff line number Diff line change
@@ -109,8 +109,6 @@ init_mysql(){
if [ $(isDBinitDone) -eq 0 ]; then
echo "Database has already been initialized"
else
echo "Disabling MySQL default ONLY_FULL_GROUP_BY"
echo "SET GLOBAL sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));" | $MYSQLCMD 1>/dev/null
echo "Database has not been initialized, importing MySQL scheme..."
$MYSQLCMD < /var/www/MISP/INSTALL/MYSQL.sql
fi