Skip to content

Commit bbcd3c0

Browse files
committed
Merge branch 'main' into 1.9.0-release
2 parents 77322dc + df05334 commit bbcd3c0

File tree

7 files changed

+58
-24
lines changed

7 files changed

+58
-24
lines changed

bin/v-update-sys-ip

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ for nic in $nics; do
4848
if [ -z "$ips" ]; then
4949
ips="$nic_ipv4s"
5050
else
51+
if [ -z "$nic_ipv4s" ]; then
52+
break
53+
fi
5154
ips="$ips $nic_ipv4s"
5255
fi
5356
done

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,37 @@ For Blackblaze use
158158
v-add-backup-host 'rclone' 'b2' '' '' 'hestiacp'
159159
```
160160

161+
## Setting up Incremental Backups
162+
163+
Enable Incremental Backups in the user packages.
164+
165+
### Using Rclone
166+
167+
Since 1.9 we include Rclone by default in Hestia Installation. Run `rclone config` as the `root` user and then select the option `n`. Follow the instruction on the screen, then save when completed.
168+
169+
Run the following command:
170+
171+
```bash
172+
v-add-backup-host-restic 'rclone:target:/folder/' '30' '8' '5' '3' '-1'
173+
```
174+
175+
```bash
176+
v-backup-users-restic
177+
```
178+
179+
or
180+
181+
```bash
182+
v-backup-user-restic username
183+
```
184+
185+
::warning
186+
A new restic repository is initiated on the first time you run this command. An encryption key is generated at the same time in /usr/local/hestia/data/users/{users}/restic.conf. Please make sure to backup this file somewhere incase the server gets comprimised or the user gets deleted. Without this "secret" key we don't provide any method to restore the user data. This is the reason why we alway advice to keep the orignal backup still working.
187+
188+
### Other methods
189+
190+
Other methods as long Restic supports it are supported how ever as we run the command as root we are not able to provide keys / password and so on before hand. This is why Rclone is in favor for other methods!
191+
161192
## How to change default backup folder
162193

163194
For security reasons, symlinks are not allowed. To change the default backup folder, you can do the following:

docs/docs/server-administration/rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ With the release of Hestia v1.6.0, we have introduced a more advanced API system
88

99
## I’m unable to connect to the API
1010

11-
With the release of Hestia v1.4.0, we have decided the security needed to be tightened. If you want to connect to the API from a remote server, you will first need to whitelist its IP address. To add multiple addresses, separate them with a new line.
11+
With the release of Hestia v1.4.0, we have decided the security needed to be tightened. If you want to connect to the API from a remote server, you will first need to whitelist its IP address. To add multiple addresses, separate them with a new line. To bypass the ip filtering, remove any existing ips and write : `allow-all`
1212

1313
## Can I disable the API?
1414

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"prettier-plugin-nginx": "^1.0.3",
5151
"prettier-plugin-sh": "^0.14.0",
5252
"prettier-plugin-sql": "^0.18.1",
53-
"stylelint": "^16.14.0",
53+
"stylelint": "^16.14.1",
5454
"stylelint-config-standard": "^36.0.1",
5555
"vitepress": "^1.6.3",
5656
"vitest": "^2.1.8",

src/deb/web-terminal/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/deb/web-terminal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"devDependencies": {
1414
"@types/ws": "^8.5.14",
15-
"@types/node": "^22.10.10"
15+
"@types/node": "^22.13.0"
1616
}
1717
}

0 commit comments

Comments
 (0)