From 90c7d4e8893f1f8e8da82e5172189c7c50952770 Mon Sep 17 00:00:00 2001 From: Exile Date: Thu, 11 Sep 2014 20:52:48 +0400 Subject: [PATCH] Backup removed --- install/sql/mysql.sql | 44 +++++++++++------------ upgrade/changes.txt | 2 ++ upload/config.php | 10 ++---- upload/includes/cron/jobs/db_backup.php | 37 ------------------- upload/includes/cron/jobs/site_backup.php | 33 ----------------- 5 files changed, 25 insertions(+), 101 deletions(-) delete mode 100644 upload/includes/cron/jobs/db_backup.php delete mode 100644 upload/includes/cron/jobs/site_backup.php diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index c6c00b019..2bb84d7d9 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -604,29 +604,27 @@ CREATE TABLE IF NOT EXISTS `bb_cron` ( -- Дамп данных таблицы `bb_cron` -- -INSERT INTO `bb_cron` VALUES (1, 0, 'Site backup', 'site_backup.php', 'daily', '1', '05:00:00', 10, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (2, 0, 'DB backup', 'db_backup.php', 'daily', '1', '05:00:00', 20, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (3, 1, 'Attach maintenance', 'attach_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (4, 1, 'Board maintenance', 'bb_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (5, 1, 'Prune forums', 'prune_forums.php', 'daily', NULL, '05:00:00', 50, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (6, 1, 'Prune topic moved stubs', 'prune_topic_moved.php', 'daily', NULL, '05:00:00', 60, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (7, 1, 'Logs cleanup', 'clean_log.php', 'daily', NULL, '05:00:00', 70, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (8, 1, 'Tracker maintenance', 'tr_maintenance.php', 'daily', NULL, '05:00:00', 90, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (9, 1, 'Clean dlstat', 'clean_dlstat.php', 'daily', NULL, '05:00:00', 100, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (10, 1, 'Prune inactive users', 'prune_inactive_users.php', 'daily', NULL, '05:00:00', 110, '', '', NULL, 1, '', 0, 1, 0); -INSERT INTO `bb_cron` VALUES (11, 1, 'Sessions cleanup', 'sessions_cleanup.php', 'interval', NULL, NULL, 255, '', '', '00:03:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (12, 1, 'DS update ''cat_forums''', 'ds_update_cat_forums.php', 'interval', NULL, NULL, 255, '', '', '00:05:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (13, 1, 'DS update ''stats''', 'ds_update_stats.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (14, 1, 'Flash topic view', 'flash_topic_view.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (15, 1, 'Clean search results', 'clean_search_results.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (16, 1, 'Tracker cleanup and dlstat', 'tr_cleanup_and_dlstat.php', 'interval', NULL, NULL, 20, '', '', '00:15:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (17, 1, 'Make tracker snapshot', 'tr_make_snapshot.php', 'interval', NULL, NULL, 10, '', '', '00:10:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (18, 1, 'Seeder last seen', 'tr_update_seeder_last_seen.php', 'interval', NULL, NULL, 255, '', '', '01:00:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (19, 1, 'Captcha', 'captcha_gen_gc.php', 'daily', NULL, '05:00:00', 120, '', '', NULL, 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (20, 1, 'Tracker dl-complete count', 'tr_complete_count.php', 'interval', NULL, NULL, 255, '', '', '06:00:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (21, 1, 'Cache garbage collector', 'cache_gc.php', 'interval', NULL, NULL, 255, '', '', '00:05:00', 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (22, 1, 'Sitemap update', 'sitemap.php', 'daily', NULL, '06:00:00', 30, '', '', NULL, 0, '', 0, 0, 0); -INSERT INTO `bb_cron` VALUES (23, 1, 'Update forums atom', 'update_forums_atom.php', 'interval', NULL, NULL, 255, '', '', '00:15:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (1, 1, 'Attach maintenance', 'attach_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (2, 1, 'Board maintenance', 'bb_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (3, 1, 'Prune forums', 'prune_forums.php', 'daily', NULL, '05:00:00', 50, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (4, 1, 'Prune topic moved stubs', 'prune_topic_moved.php', 'daily', NULL, '05:00:00', 60, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (5, 1, 'Logs cleanup', 'clean_log.php', 'daily', NULL, '05:00:00', 70, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (6, 1, 'Tracker maintenance', 'tr_maintenance.php', 'daily', NULL, '05:00:00', 90, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (7, 1, 'Clean dlstat', 'clean_dlstat.php', 'daily', NULL, '05:00:00', 100, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (8, 1, 'Prune inactive users', 'prune_inactive_users.php', 'daily', NULL, '05:00:00', 110, '', '', NULL, 1, '', 0, 1, 0); +INSERT INTO `bb_cron` VALUES (9, 1, 'Sessions cleanup', 'sessions_cleanup.php', 'interval', NULL, NULL, 255, '', '', '00:03:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (10, 1, 'DS update ''cat_forums''', 'ds_update_cat_forums.php', 'interval', NULL, NULL, 255, '', '', '00:05:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (11, 1, 'DS update ''stats''', 'ds_update_stats.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (12, 1, 'Flash topic view', 'flash_topic_view.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (13, 1, 'Clean search results', 'clean_search_results.php', 'interval', NULL, NULL, 255, '', '', '00:10:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (14, 1, 'Tracker cleanup and dlstat', 'tr_cleanup_and_dlstat.php', 'interval', NULL, NULL, 20, '', '', '00:15:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (15, 1, 'Make tracker snapshot', 'tr_make_snapshot.php', 'interval', NULL, NULL, 10, '', '', '00:10:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (16, 1, 'Seeder last seen', 'tr_update_seeder_last_seen.php', 'interval', NULL, NULL, 255, '', '', '01:00:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (17, 1, 'Captcha', 'captcha_gen_gc.php', 'daily', NULL, '05:00:00', 120, '', '', NULL, 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (18, 1, 'Tracker dl-complete count', 'tr_complete_count.php', 'interval', NULL, NULL, 255, '', '', '06:00:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (19, 1, 'Cache garbage collector', 'cache_gc.php', 'interval', NULL, NULL, 255, '', '', '00:05:00', 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (20, 1, 'Sitemap update', 'sitemap.php', 'daily', NULL, '06:00:00', 30, '', '', NULL, 0, '', 0, 0, 0); +INSERT INTO `bb_cron` VALUES (21, 1, 'Update forums atom', 'update_forums_atom.php', 'interval', NULL, NULL, 255, '', '', '00:15:00', 0, '', 0, 0, 0); -- -------------------------------------------------------- diff --git a/upgrade/changes.txt b/upgrade/changes.txt index 715985ee1..17b8b19d6 100644 --- a/upgrade/changes.txt +++ b/upgrade/changes.txt @@ -16,3 +16,5 @@ DELETE FROM `bb_config` WHERE `config_name` = 'reports_enabled'; ALTER TABLE `bb_posts` DROP COLUMN `post_reported`; ALTER TABLE `bb_privmsgs` DROP COLUMN `privmsgs_reported`; ALTER TABLE `bb_topics` DROP COLUMN `topic_reported`; +DELETE FROM `bb_cron` WHERE `cron_script` = 'site_backup.php'; +DELETE FROM `bb_cron` WHERE `cron_script` = 'db_backup.php'; diff --git a/upload/config.php b/upload/config.php index f231a7a29..bcc03d31e 100644 --- a/upload/config.php +++ b/upload/config.php @@ -13,7 +13,6 @@ * Server - Cloudflare - Script versions - - Backup script - GZip * Tracker * FAQ url @@ -72,7 +71,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Version info $bb_cfg['tp_version'] = '2.1.1'; -$bb_cfg['tp_release_date'] = '07-09-2014'; +$bb_cfg['tp_release_date'] = '11-09-2014'; $bb_cfg['tp_release_state'] = 'ALPHA'; // Database @@ -147,12 +146,7 @@ if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) } // Increase number after changing js or css -$bb_cfg['js_ver'] = 1; -$bb_cfg['css_ver'] = 1; - -// Backup -$bb_cfg['db_backup_shell_cmd'] = ''; // '/path/to/db_backup.sh 2>&1' -$bb_cfg['site_backup_shell_cmd'] = ''; +$bb_cfg['js_ver'] = $bb_cfg['css_ver'] = 1; // GZip $bb_cfg['gzip_compress'] = true; // compress output diff --git a/upload/includes/cron/jobs/db_backup.php b/upload/includes/cron/jobs/db_backup.php deleted file mode 100644 index 75b995470..000000000 --- a/upload/includes/cron/jobs/db_backup.php +++ /dev/null @@ -1,37 +0,0 @@ -from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); - $emailer->replyto($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); - - $emailer->use_template('blank'); - $emailer->email_address($bb_cfg['tech_admin_email']); - $emailer->set_subject("DB Backup failed [{$bb_cfg['server_name']}]"); - - $emailer->assign_vars(array( - 'MESSAGE' => $cron_runtime_log, - )); - $emailer->send(); - $emailer->reset(); -} - -sleep(10); - -DB()->expect_slow_query(16*60, 100); \ No newline at end of file diff --git a/upload/includes/cron/jobs/site_backup.php b/upload/includes/cron/jobs/site_backup.php deleted file mode 100644 index 6aced5c6b..000000000 --- a/upload/includes/cron/jobs/site_backup.php +++ /dev/null @@ -1,33 +0,0 @@ -from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); - $emailer->replyto($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); - - $emailer->use_template('blank'); - $emailer->email_address($bb_cfg['tech_admin_email']); - $emailer->set_subject("Site Backup failed [{$bb_cfg['server_name']}]"); - - $emailer->assign_vars(array( - 'MESSAGE' => $cron_runtime_log, - )); - $emailer->send(); - $emailer->reset(); -} - -sleep(10); \ No newline at end of file