From a85a4a93480a6041ee37d22cca520fa057f8cd10 Mon Sep 17 00:00:00 2001 From: Till <t.brehm@ispconfig.org> Date: Wed, 12 Jun 2024 12:30:35 +0200 Subject: [PATCH] Fixes #6713 Remove rar compression format in backup options --- install/sql/incremental/upd_dev_collection.sql | 2 ++ interface/web/sites/form/web_vhost_domain.tform.php | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 34463d0b9e..18cbd75beb 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1,3 +1,5 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0); ALTER TABLE `web_domain` ADD `disable_symlinknotowner` enum('n','y') NOT NULL default 'n' AFTER `last_jailkit_hash`; +UPDATE `web_domain` SET `backup_format_web` = 'tar_gzip' WHERE `backup_format_web` = 'rar'; +UPDATE `web_domain` SET `backup_format_db` = 'zip' WHERE `backup_format_db` = 'rar'; diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index f4aabfd70e..63c484887c 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -682,7 +682,6 @@ if ($backup_available) { 'xz', 'unxz', '7z', - 'rar', ); foreach ($compressors_list as $compressor) { if (!$app->system->is_installed($compressor)) { @@ -740,7 +739,6 @@ if ($backup_available) { 'tar_7z_lzma' => 'backup_format_tar_7z_lzma_txt', 'tar_7z_ppmd' => 'backup_format_tar_7z_ppmd_txt', 'tar_7z_bzip2' => 'backup_format_tar_7z_bzip2_txt', - 'rar' => 'backup_format_rar_txt', ) ), 'backup_format_db' => array ( @@ -757,7 +755,6 @@ if ($backup_available) { '7z_lzma' => 'backup_format_7z_lzma_txt', '7z_ppmd' => 'backup_format_7z_ppmd_txt', '7z_bzip2' => 'backup_format_7z_bzip2_txt', - 'rar' => 'backup_format_rar_txt', ) ), 'backup_encrypt' => array ( -- GitLab