From 6b4ae09b087b72c8bb07b224fbb04a11e438ea97 Mon Sep 17 00:00:00 2001 From: James Droste Date: Tue, 25 Aug 2020 17:04:06 -0700 Subject: [PATCH 1/2] Allow customization of the MISP Modules server Similar to redis, we should allow the ability to customize this value, as it gets overwritten on startup --- server/files/entrypoint_nginx.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/files/entrypoint_nginx.sh b/server/files/entrypoint_nginx.sh index 46fdda1..6bf62dd 100755 --- a/server/files/entrypoint_nginx.sh +++ b/server/files/entrypoint_nginx.sh @@ -7,6 +7,7 @@ MISP_APP_CONFIG_PATH=/var/www/MISP/app/Config [ -z "$MYSQL_PASSWORD" ] && MYSQL_PASSWORD=example [ -z "$MYSQL_DATABASE" ] && MYSQL_DATABASE=misp [ -z "$REDIS_FQDN" ] && REDIS_FQDN=redis +[ -z "$MISP_MODULES_FQDN" ] && MISP_MODULES_FQDN="http://misp-modules" [ -z "$MYSQLCMD" ] && MYSQLCMD="mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -P $MYSQL_PORT -h $MYSQL_HOST -r -N $MYSQL_DATABASE" ENTRYPOINT_PID_FILE="/entrypoint_apache.install" @@ -39,13 +40,13 @@ init_misp_config(){ /var/www/MISP/app/Console/cake Admin setSetting "Plugin.ZeroMQ_enable" true /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Enrichment_services_enable" true - /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Enrichment_services_url" "http://misp-modules" + /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Enrichment_services_url" "$MISP_MODULES_FQDN" /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Import_services_enable" true - /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Import_services_url" "http://misp-modules" + /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Import_services_url" "$MISP_MODULES_FQDN" /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_enable" true - /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_url" "http://misp-modules" + /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_url" "$MISP_MODULES_FQDN" /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Cortex_services_enable" false } From 3cfe8034262f4157109337c62dafb1b312b07fb5 Mon Sep 17 00:00:00 2001 From: James Droste Date: Tue, 25 Aug 2020 17:27:53 -0700 Subject: [PATCH 2/2] Add usage of MISP_MODULES_FQDN --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 692c630..419b2b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,6 +49,7 @@ services: # - "NOREDIR=true" # Do not redirect port 80 # - "DISIPV6=true" # Disable IPV6 in nginx # - "SECURESSL=true" # Enable higher security SSL in nginx +# - "MISP_MODULES_FQDN=http://misp-modules" # Set the MISP Modules FQDN, used for Enrichment_services_url/Import_services_url/Export_services_url misp-modules: image: coolacid/misp-docker:modules-latest environment: