Skip to content

Commit 0531840

Browse files
ostefanoostefano
committed
Bump version and deprecate CRON jobs
1 parent 64ab35f commit 0531840

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

‎core/files/configure_misp.sh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -528,16 +528,33 @@ create_default_scheduled_tasks() {
528528
PUSHALL_INTERVAL="$(convert_cron_to_seconds "$CRON_PUSHALL")"
529529
fi
530530

531-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) VALUES (1, 'Feed', 86400, 'Daily fetch of all Feeds', 1, 'fetch', 'all', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
532-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) VALUES (2, 'Feed', 86400, 'Daily cache of all Feeds', 1, 'cache', 'all,all', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
533-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) VALUES (3, 'Server', $PULLALL_INTERVAL, 'Daily pull of all Servers', 1, 'pull', 'all,full', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
534-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) VALUES (4, 'Server', $PUSHALL_INTERVAL, 'Daily push of all Servers', 1, 'push', 'all,full', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
535-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (5, 'Admin', 86400, 'Daily update of Galaxies', 1, 'updateGalaxies', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
536-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (6, 'Admin', 86400, 'Daily update of Galaxies', 1, 'updateGalaxies', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
537-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (7, 'Admin', 86400, 'Daily update of Taxonomies', 1, 'updateTaxonomies', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
538-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (8, 'Admin', 86400, 'Daily update of Warninglists', 1, 'updateWarningLists', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
539-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (9, 'Admin', 86400, 'Daily update of Noticelists', 1, 'updateNoticeLists', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
540-
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) VALUES (10, 'Admin', 86400, 'Daily update of Object Templates', 1, 'updateObjectTemplates', $CRON_USER_ID, 0, '');" | ${MYSQL_CMD}
531+
echo "INSERT INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) \
532+
VALUES (1, 'Feed', 86400, 'Daily fetch of all Feeds', $CRON_USER_ID, 'fetch', 'all', 1, 0, '') \
533+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
534+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) \
535+
VALUES (2, 'Feed', 86400, 'Daily cache of all Feeds', $CRON_USER_ID, 'cache', 'all,all', 1, 0, '') \
536+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
537+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) \
538+
VALUES (3, 'Server', $PULLALL_INTERVAL, 'Daily pull of all Servers', $CRON_USER_ID, 'pull', 'all,full', 1, 0, '') \
539+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID AND timer=$PULLALL_INTERVAL;" | ${MYSQL_CMD}
540+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, params, enabled, next_execution_time, message) \
541+
VALUES (4, 'Server', $PUSHALL_INTERVAL, 'Daily push of all Servers', $CRON_USER_ID, 'push', 'all,full', 1, 0, '') \
542+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID AND timer=$PUSHALL_INTERVAL;" | ${MYSQL_CMD}
543+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) \
544+
VALUES (5, 'Admin', 86400, 'Daily update of Galaxies', $CRON_USER_ID, 'updateGalaxies', 1, 0, '') \
545+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
546+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) \
547+
VALUES (6, 'Admin', 86400, 'Daily update of Taxonomies', $CRON_USER_ID, 'updateTaxonomies', 1, 0, '') \
548+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
549+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) \
550+
VALUES (7, 'Admin', 86400, 'Daily update of Warninglists', $CRON_USER_ID, 'updateWarningLists', 1, 0, '') \
551+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
552+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) \
553+
VALUES (8, 'Admin', 86400, 'Daily update of Noticelists', $CRON_USER_ID, 'updateNoticeLists', 1, 0, '') \
554+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
555+
echo "INSERT IGNORE INTO $MYSQL_DATABASE.scheduled_tasks (id, type, timer, description, user_id, action, enabled, next_execution_time, message) \
556+
VALUES (9, 'Admin', 86400, 'Daily update of Object Templates', $CRON_USER_ID, 'updateObjectTemplates', 1, 0, '') \
557+
ON DUPLICATE KEY UPDATE user_id=$CRON_USER_ID;" | ${MYSQL_CMD}
541558
}
542559

543560
echo "MISP | Update CA certificates ..." && update_ca_certificates

‎template.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build-time variables
33
##
44

5-
CORE_TAG=v2.5.18
5+
CORE_TAG=v2.5.20
66
# CORE_FLAVOR=full
77
MODULES_TAG=v3.0.2
88
# MODULES_FLAVOR=full

0 commit comments

Comments
 (0)