From 65fc20002e3635bcbcc7e4621485510eb2707a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ivind=20Hoel?= Date: Tue, 3 Sep 2024 12:44:07 +0000 Subject: [PATCH] Run component update in background only if db is already initialised on startup --- core/files/configure_misp.sh | 14 +++++++++----- core/files/entrypoint_nginx.sh | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/files/configure_misp.sh b/core/files/configure_misp.sh index c04ccb5..ba35f5c 100755 --- a/core/files/configure_misp.sh +++ b/core/files/configure_misp.sh @@ -351,11 +351,15 @@ init_settings() { } update_components() { - sudo -b -u www-data /var/www/MISP/app/Console/cake Admin updateGalaxies - sudo -b -u www-data /var/www/MISP/app/Console/cake Admin updateTaxonomies - sudo -b -u www-data /var/www/MISP/app/Console/cake Admin updateWarningLists - sudo -b -u www-data /var/www/MISP/app/Console/cake Admin updateNoticeLists - sudo -b -u www-data /var/www/MISP/app/Console/cake Admin updateObjectTemplates "$CRON_USER_ID" + UPDATE_SUDO_CMD="sudo -u www-data" + if [ ! -z "${DB_ALREADY_INITIALISED}" ]; then + UPDATE_SUDO_CMD="sudo -b -u www-data" + fi + ${UPDATE_SUDO_CMD} /var/www/MISP/app/Console/cake Admin updateGalaxies + ${UPDATE_SUDO_CMD} /var/www/MISP/app/Console/cake Admin updateTaxonomies + ${UPDATE_SUDO_CMD} /var/www/MISP/app/Console/cake Admin updateWarningLists + ${UPDATE_SUDO_CMD} /var/www/MISP/app/Console/cake Admin updateNoticeLists + ${UPDATE_SUDO_CMD} /var/www/MISP/app/Console/cake Admin updateObjectTemplates "$CRON_USER_ID" } update_ca_certificates() { diff --git a/core/files/entrypoint_nginx.sh b/core/files/entrypoint_nginx.sh index 49720af..e3e5b38 100755 --- a/core/files/entrypoint_nginx.sh +++ b/core/files/entrypoint_nginx.sh @@ -37,6 +37,7 @@ init_mysql(){ if [ $(isDBinitDone) -eq 0 ]; then echo "... database has already been initialized" + export DB_ALREADY_INITIALISED=true else echo "... database has not been initialized, importing MySQL scheme..." $MYSQLCMD < /var/www/MISP/INSTALL/MYSQL.sql