diff --git a/web/crontab b/web/crontab index 8b64fd5f..7fced252 100644 --- a/web/crontab +++ b/web/crontab @@ -1,6 +1,6 @@ # Edit the PHP binary and project path for your deployment before installing. # VM service-period and traffic enforcement is the virt-cloud-lifecycle systemd service, not cron. # No account expiry, proxy-node or automatic record-deletion jobs. -0 6 * * * /usr/bin/php /home/www/virt-cloud/web/xcat backupJob >> /home/www/virt-cloud/web/storage/logs/database_backup.log 2>&1 -* * * * * /usr/bin/php /home/www/virt-cloud/web/xcat usdtScanJob 50 >> /home/www/virt-cloud/web/storage/logs/usdt_scan.log 2>&1 -*/5 * * * * /usr/bin/php /home/www/virt-cloud/web/xcat siteAnalyticsJob 2 >> /home/www/virt-cloud/web/storage/logs/site_analytics.log 2>&1 +0 6 * * * /usr/bin/php /home/virt-cloud/web/xcat backupJob >> /home/virt-cloud/web/storage/logs/database_backup.log 2>&1 +* * * * * /usr/bin/php /home/virt-cloud/web/xcat usdtScanJob 50 >> /home/virt-cloud/web/storage/logs/usdt_scan.log 2>&1 +*/5 * * * * /usr/bin/php /home/virt-cloud/web/xcat siteAnalyticsJob 2 >> /home/virt-cloud/web/storage/logs/site_analytics.log 2>&1 diff --git a/web/sql/user_log.sql b/web/sql/user_log.sql index a842ee75..9b8ba016 100644 --- a/web/sql/user_log.sql +++ b/web/sql/user_log.sql @@ -90,13 +90,7 @@ CREATE TABLE `user_email_log` ( ALTER TABLE `setting` ADD PRIMARY KEY (`id`), - ADD UNIQUE KEY `idx_setting_nn_gmjp` (`key`), - ADD UNIQUE KEY `idx_setting_bzrhg9` (`key`), - ADD UNIQUE KEY `idx_setting_tl_c2dp_uw` (`key`), - ADD UNIQUE KEY `idx_setting_p_jq3lx_n_sq_ic_g` (`key`), - ADD UNIQUE KEY `idx_setting_if_q_hl_oq` (`key`), - ADD UNIQUE KEY `idx_setting_fjzl_y_zw_jd` (`key`), - ADD UNIQUE KEY `idx_setting_h7v_sb_mwfi0` (`key`); + ADD UNIQUE KEY `uniq_setting_key` (`key`); ALTER TABLE `site_security_events` ADD PRIMARY KEY (`id`), diff --git a/web/tests/LogSchemaCrontabContractTest.php b/web/tests/LogSchemaCrontabContractTest.php new file mode 100644 index 00000000..9e36a897 --- /dev/null +++ b/web/tests/LogSchemaCrontabContractTest.php @@ -0,0 +1,47 @@ +.*?);/s', + (string) $schema, + $matches +) === 1) { + $settingBlock = (string) $matches['body']; +} +$assert($settingBlock !== '', 'setting indexes are missing'); +$assert( + substr_count($settingBlock, 'UNIQUE KEY') === 1, + 'setting must have exactly one unique key index' +); +$assert( + str_contains($settingBlock, 'UNIQUE KEY `uniq_setting_key` (`key`)'), + 'setting unique key index must use the canonical name' +); +$assert( + !str_contains((string) $schema, 'idx_setting_'), + 'legacy duplicate setting indexes must not remain in fresh schema' +); + +$expectedAnalytics = '*/5 * * * * /usr/bin/php ' + . '/home/virt-cloud/web/xcat siteAnalyticsJob 2 ' + . '>> /home/virt-cloud/web/storage/logs/site_analytics.log 2>&1'; +$assert( + str_contains((string) $crontab, $expectedAnalytics), + 'site analytics must retain the original five-minute cron schedule' +); +$assert( + !str_contains((string) $crontab, '/home/www/virt-cloud'), + 'crontab must use the documented deployment root' +); + +echo "Log schema and crontab contract test passed\n";