Skip to content

Commit 3f5ed5a

Browse files
authored
Merge pull request hestiacp#1658 from hestiacp/fix/1655-restore-user-files
Disable changing backup folder hestiacp#1655
2 parents cc0da58 + d2347be commit 3f5ed5a

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file.
4040
- Fixed an issue which doesnt save the mysql wait_timeout due to wrong regexp attribute (thanks @guicapanema).
4141
- Improved subdoamin handling to prevent the ability of creating subdomains when the tld belongs to another account (thanks @KuJoe and @sickcodes).
4242
- Improved the IDN handling to remove the current issues with let's encrypt and mail.
43+
- Disabled changing backup folder via Web UI because it used symbolic link instead of mount causing issues with restore mail / user files
4344

4445
## [1.3.3] - Service Release
4546
### Bugfixes

bin/v-change-sys-config-value

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ else
4646
sed -i "s|$key=.*|$key='$value'|g" $HESTIA/conf/hestia.conf
4747
fi
4848

49-
if [ "$key" = "BACKUP" ] && [ "$value" != '/backup' ]; then
50-
rm /backup
51-
ln -s $value /backup
52-
fi
53-
54-
5549
#----------------------------------------------------------#
5650
# Hestia #
5751
#----------------------------------------------------------#

web/edit/server/index.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,12 @@
508508
// Change backup path
509509
if (empty($_SESSION['error_msg'])) {
510510
if ($_POST['v_backup_dir'] != $v_backup_dir ) {
511+
/*
512+
See #1655
511513
exec (HESTIA_CMD."v-change-sys-config-value BACKUP ".escapeshellarg($_POST['v_backup_dir']), $output, $return_var);
512514
check_return_code($return_var,$output);
513515
unset($output);
516+
*/
514517
if (empty($_SESSION['error_msg'])) $v_backup_dir = $_POST['v_backup_dir'];
515518
$v_backup_adv = 'yes';
516519
}

web/templates/admin/edit_server.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,12 @@
719719
</tr>
720720
<tr>
721721
<td class="vst-text">
722-
<?php print _('Directory') ?>
722+
<?php print _('Directory') ?> <a href="https://docs.hestiacp.com/admin_docs/backups.html"><i class="fas fa-question-circle"></i></a>
723723
</td>
724724
</tr>
725725
<tr>
726726
<td>
727-
<input type="text" size="20" class="vst-input" name="v_backup_dir" value="<?=trim($v_backup_dir, "'")?>">
727+
<input type="text" size="20" class="vst-input" name="v_backup_dir" value="<?=trim($v_backup_dir, "'")?>" disabled="disabled">
728728
<br><br>
729729
</td>
730730
</tr>

0 commit comments

Comments
 (0)