external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-17 17:57:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'jammyjellyfish2204' into jammyjellyfish2204-update-cipher-sha2

Browse Source
This commit is contained in:
Steve Hay
2022-09-17 11:24:06 -04:00
parent ca214f442e d584a41e60
commit c46ccb1975
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
management/daemon.py
View File

@@ -122,7 +122,6 @@ def index():
no_admins_exist = (len(get_admins(env)) == 0)
import boto3.s3
from urllib.parse import urlparse
backup_s3_hosts = [(r, f"s3.{r}.amazonaws.com") for r in boto3.session.Session().get_available_regions('s3')]

1
management/templates/system-backup.html
View File

@@ -269,6 +269,7 @@ function show_custom_backup() {
$("#backup-target-type").val("s3");
var hostpath = r.target.substring(5).split('/');
var host = hostpath.shift();
$("#backup-target-s3-host-select").val(host);
$("#backup-target-s3-host").val(host);
$("#backup-target-s3-path").val(hostpath.join('/'));
} else if (r.target.substring(0, 5) == "b2://") {