Run component update in background only if db is already initialised …

…on startup
MISP · Sep 3, 2024 · 65fc200 · 65fc200
1 parent a8d5b5b
commit 65fc200
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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