Skip to content

Commit 81016c9

Browse files
authored
Remove delete buttom Edit user page (hestiacp#3397)
* Users can still be deleted via list users As everything else * Improve docs regarding rclone * Add note about apache2 accidentally overwritten during backup
1 parent 626e6f0 commit 81016c9

File tree

3 files changed

+48
-17
lines changed

3 files changed

+48
-17
lines changed

docs/docs/server-administration/backup-restore.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,33 @@ curl https://rclone.org/install.sh | sudo bash
105105

106106
Once the download and installation is complete, run `rclone config` and then `n`. Follow the instruction on the screen, then save when completed.
107107

108+
To verify if it is working run as intended:
109+
110+
```bash
111+
echo "test" > /tmp/backuptest.txt
112+
rclone cp /tmp/backuptest.txt $HOST:$FOLDER/backuptest.txt
113+
rclone lsf $HOST:$FOLDER
114+
```
115+
116+
And see the file has been uploaded
117+
118+
```bash
119+
rclone delete $HOST:$FOLDER/backuptest.txt
120+
```
121+
108122
Once the config has been saved you can setup Hestia with the following command:
109123

110124
```bash
111125
v-add-backup-host 'rclone' 'remote-name' '' '' 'Bucket or Folder name' ''
112126
```
113127

114128
::: tip
115-
B2 requires you to setup a bucket during the `v-add-backup-host` stage. S3 or R2 storage will work fine during the `rclone config` stage.
129+
Configuration per endpoint might be different! Make sure to test it is working before relying on it. To verify it works run
130+
131+
```bash
132+
v-backup-user admin
133+
```
134+
116135
:::
117136

118137
For example:
@@ -130,7 +149,7 @@ r2 s3
130149
To use the "R2" endpoint use
131150

132151
```bash
133-
v-add-backup-host 'rclone' 'r2'
152+
v-add-backup-host 'rclone' 'r2' '' '' 'folder'
134153
```
135154

136155
For Blackblaze use

docs/docs/server-administration/troubleshooting.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,30 @@ v-change-user-config-value admin LOGIN_ALLOW_IPS ''
2828
## Can I update my cronjobs via `crontab -e`?
2929

3030
No, you cannot. When you update HestiaCP, the crontab will simply get overwritten. The changes will not get saved in backups either.
31+
32+
## After update Apache2 I am not able to restart Apache2 or Nginx
33+
34+
The error message states (98) Address already in use: AG0072: make_sock: could not bind to address 0.0.0.0:80
35+
36+
When a package update sometimes comes with a new config and probally it has been overwritten...
37+
38+
```batch
39+
Configuration file '/etc/apache2/apache2.conf'
40+
==> Modified (by you or by a script) since installation.
41+
==> Package distributor has shipped an updated version.
42+
What would you like to do about it ? Your options are:
43+
Y or I : install the package maintainer's version
44+
N or O : keep your currently-installed version
45+
D : show the differences between the versions
46+
Z : start a shell to examine the situation
47+
The default action is to keep your current version.
48+
*** apache2.conf (Y/I/N/O/D/Z) [default=N] ?
49+
```
50+
51+
If you see this message **ALWAYS** press "N" or **ENTER** to select the default value!
52+
53+
How ever if you entered Y or I. Then replace the config that can be found in /root/hst_backups/xxxxx/conf/apache2/ folder and copy over apache2.conf and ports.conf to /etc/apache2/ folder
54+
55+
xxxxxx is the date/time the backup is made during the last update of HestiaCP
56+
57+
If you don't have have a backup made you can also copy the config in /usr/local/hestia/install/deb/apache2/apache2.conf to /etc/apache2.conf and also empty /etc/apache2/ports.conf

web/templates/pages/edit_user.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,6 @@
3333
<?php } ?>
3434
</div>
3535
<div class="toolbar-buttons">
36-
<?php if ($_SESSION["user"] == $v_username || isset($_SESSION["look"])) { ?>
37-
<!-- Do not show delete button for currently logged in user-->
38-
<?} else {?>
39-
<a href="/login/?loginas=<?= htmlentities($v_username) ?>&token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-create" title="<?= _("login as") ?>">
40-
<i class="fas fa-right-to-bracket icon-maroon"></i><?= _("login as") ?>
41-
</a>
42-
<a class="data-controls do_delete button button-secondary button-danger">
43-
<i class="do_delete fas fa-circle-xmark icon-red"></i>
44-
<?= _("Delete") ?>
45-
<input type="hidden" name="delete_url" value="/delete/user/?user=<?= htmlentities($v_username) ?>&token=<?= $_SESSION["token"] ?>">
46-
<div class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
47-
<p><?= sprintf(_("DELETE_USER_CONFIRMATION"), htmlentities($v_username)) ?></p>
48-
</div>
49-
</a>
50-
<?php } ?>
5136
<button type="submit" class="button" form="vstobjects">
5237
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
5338
</button>

0 commit comments

Comments
 (0)