mirror/Cosmos-Server
1
0
Fork 0
mirror of https://github.com/azukaar/Cosmos-Server.git synced 2026-05-03 17:59:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

[release] v0.18.0-unstable9

Browse Source
This commit is contained in:
Yann Stepienik
2025-02-16 18:31:03 +00:00
parent c887bb0b34
commit 634c68ebe6
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/config/users/configman.jsx
+4 -4
View File
@@ -149,7 +149,7 @@ const ConfigManagement = () => {
MonitoringEnabled: !config.MonitoringDisabled,
BackupOutputDir: config.BackupOutputDir,
IncrBackupOutputDir: config.Backup.Backups && config.Backup.Backups["Cosmos Internal Backup"] ? config.Backup.Backups["Cosmos Internal Backup"].Repository : "",
IncrBackupOutputDir: config.Backup && config.Backup.Backups && config.Backup.Backups["Cosmos Internal Backup"] ? config.Backup.Backups["Cosmos Internal Backup"].Repository : "",
AdminWhitelistIPs: config.AdminWhitelistIPs && config.AdminWhitelistIPs.join(', '),
AdminConstellationOnly: config.AdminConstellationOnly,
@@ -251,9 +251,9 @@ const ConfigManagement = () => {
Backup: {
...config.Backup,
Backups: values.IncrBackupOutputDir ? {
...config.Backup.Backups,
...(config.Backup.Backups || {}),
"Cosmos Internal Backup": {
...config.Backup.Backups["Cosmos Internal Backup"],
...(config.Backup.Backups ? config.Backup.Backups["Cosmos Internal Backup"] : {}),
"Crontab": "0 0 4 * * *",
"CrontabForget": "0 0 12 * * *",
"Source": status && status.ConfigFolder,
@@ -261,7 +261,7 @@ const ConfigManagement = () => {
"Name": "Cosmos Internal Backup",
Repository: values.IncrBackupOutputDir
}
} : config.Backup.Backups
} : (config.Backup.Backups || {})
}
}
src/backups/restic.go
+1 -4
View File
@@ -7,7 +7,6 @@ import (
"os/exec"
"regexp"
"strings"
"context"
"github.com/creack/pty"
"github.com/azukaar/cosmos-server/src/utils"
@@ -338,9 +337,7 @@ func CreateRestoreJob(config RestoreConfig) {
Scheduler: "Restic",
Name: fmt.Sprintf("Restic restore %s", config.Name),
Cancellable: true,
Job: func(OnLog func(string), OnFail func(error), OnSuccess func(), ctx context.Context, cancel context.CancelFunc) func(OnLog func(string), OnFail func(error), OnSuccess func(), ctx context.Context, cancel context.CancelFunc) {
return cron.JobFromCommandWithEnv(env, "./restic", prependResticArgs(args)...)(OnLog, OnFail, OnSuccess, ctx, cancel)
},
Job: cron.JobFromCommandWithEnv(env, "./restic", prependResticArgs(args)...),
Resource: "backup@" + config.Name,
})
})()