mirror of https://github.com/MISP/misp-docker
Run component updates in the background
parent
24690cafe5
commit
7e595ff585
|
@ -351,11 +351,18 @@ init_settings() {
|
||||||
}
|
}
|
||||||
|
|
||||||
update_components() {
|
update_components() {
|
||||||
sudo -u www-data /var/www/MISP/app/Console/cake Admin updateGalaxies
|
UPDATE_SUDO_CMD="sudo -u www-data"
|
||||||
sudo -u www-data /var/www/MISP/app/Console/cake Admin updateTaxonomies
|
if [ ! -z "${DB_ALREADY_INITIALISED}" ]; then
|
||||||
sudo -u www-data /var/www/MISP/app/Console/cake Admin updateWarningLists
|
if [[ "$ENABLE_BACKGROUND_UPDATES" = "true" ]]; then
|
||||||
sudo -u www-data /var/www/MISP/app/Console/cake Admin updateNoticeLists
|
echo "... updates will run in the background"
|
||||||
sudo -u www-data /var/www/MISP/app/Console/cake Admin updateObjectTemplates "$CRON_USER_ID"
|
UPDATE_SUDO_CMD="sudo -b -u www-data"
|
||||||
|
fi
|
||||||
|
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() {
|
update_ca_certificates() {
|
||||||
|
@ -431,7 +438,7 @@ echo "MISP | Init default user and organization ..." && init_user
|
||||||
|
|
||||||
echo "MISP | Resolve critical issues ..." && apply_critical_fixes
|
echo "MISP | Resolve critical issues ..." && apply_critical_fixes
|
||||||
|
|
||||||
echo "MISP | Update components ..." && update_components
|
echo "MISP | Start component updates ..." && update_components
|
||||||
|
|
||||||
echo "MISP | Resolve non-critical issues ..." && apply_optional_fixes
|
echo "MISP | Resolve non-critical issues ..." && apply_optional_fixes
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ export AUTOCONF_ADMIN_KEY=${AUTOCONF_ADMIN_KEY:-true}
|
||||||
export OIDC_ENABLE=${OIDC_ENABLE:-false}
|
export OIDC_ENABLE=${OIDC_ENABLE:-false}
|
||||||
export LDAP_ENABLE=${LDAP_ENABLE:-false}
|
export LDAP_ENABLE=${LDAP_ENABLE:-false}
|
||||||
export ENABLE_DB_SETTINGS=${ENABLE_DB_SETTINGS:-false}
|
export ENABLE_DB_SETTINGS=${ENABLE_DB_SETTINGS:-false}
|
||||||
|
export ENABLE_BACKGROUND_UPDATES=${ENABLE_BACKGROUND_UPDATES:-false}
|
||||||
export PROXY_ENABLE=${PROXY_ENABLE:-false}
|
export PROXY_ENABLE=${PROXY_ENABLE:-false}
|
||||||
export DEBUG=${DEBUG:-0}
|
export DEBUG=${DEBUG:-0}
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ init_mysql(){
|
||||||
|
|
||||||
if [ $(isDBinitDone) -eq 0 ]; then
|
if [ $(isDBinitDone) -eq 0 ]; then
|
||||||
echo "... database has already been initialized"
|
echo "... database has already been initialized"
|
||||||
|
export DB_ALREADY_INITIALISED=true
|
||||||
else
|
else
|
||||||
echo "... database has not been initialized, importing MySQL scheme..."
|
echo "... database has not been initialized, importing MySQL scheme..."
|
||||||
$MYSQLCMD < /var/www/MISP/INSTALL/MYSQL.sql
|
$MYSQLCMD < /var/www/MISP/INSTALL/MYSQL.sql
|
||||||
|
|
|
@ -101,6 +101,7 @@ services:
|
||||||
- "DISABLE_IPV6=${DISABLE_IPV6}"
|
- "DISABLE_IPV6=${DISABLE_IPV6}"
|
||||||
- "DISABLE_SSL_REDIRECT=${DISABLE_SSL_REDIRECT}"
|
- "DISABLE_SSL_REDIRECT=${DISABLE_SSL_REDIRECT}"
|
||||||
- "ENABLE_DB_SETTINGS=${ENABLE_DB_SETTINGS}"
|
- "ENABLE_DB_SETTINGS=${ENABLE_DB_SETTINGS}"
|
||||||
|
- "ENABLE_BACKGROUND_UPDATES=${ENABLE_BACKGROUND_UPDATES}"
|
||||||
- "ENCRYPTION_KEY=${ENCRYPTION_KEY}"
|
- "ENCRYPTION_KEY=${ENCRYPTION_KEY}"
|
||||||
# standard settings
|
# standard settings
|
||||||
- "ADMIN_EMAIL=${ADMIN_EMAIL}"
|
- "ADMIN_EMAIL=${ADMIN_EMAIL}"
|
||||||
|
|
|
@ -49,6 +49,8 @@ BASE_URL=
|
||||||
ENABLE_DB_SETTINGS=
|
ENABLE_DB_SETTINGS=
|
||||||
# encryption key. defaults to empty string
|
# encryption key. defaults to empty string
|
||||||
ENCRYPTION_KEY=
|
ENCRYPTION_KEY=
|
||||||
|
# enable background updates. defaults to false
|
||||||
|
ENABLE_BACKGROUND_UPDATES=
|
||||||
|
|
||||||
# defines the FQDN of the mail sub-system (defaults to 'mail')
|
# defines the FQDN of the mail sub-system (defaults to 'mail')
|
||||||
# SMTP_FQDN=
|
# SMTP_FQDN=
|
||||||
|
|
Loading…
Reference in New Issue