Skip to content

Merge master 2025.4.1 #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelGeo merged 5 commits into from
Jun 2, 2025
Merged

Merge master 2025.4.1 #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25ae307
Rename CLOSED_ACCOUNT_EXPIRATION -> ACCOUNT_EXPIRATION
MarcelGeo May 6, 2025
7d18232
Merge pull request #448 from MerginMaps/account_expiration_rename_env
MarcelGeo May 12, 2025
ec51ac6
Fix get_x_accel uri for absolute paths
varmar05 May 13, 2025
f6d0721
Merge pull request #455 from MerginMaps/fix_accel_uri
MarcelGeo May 13, 2025
f6009d0
Merge remote-tracking branch 'origin/master' into merge-master-2025.4.1
MarcelGeo Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deployment/community/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ CELERY_RESULT_BACKEND=redis://merginmaps-redis:6379/0

# various life times

#CLOSED_ACCOUNT_EXPIRATION=5 # time in days after user closed his account to all projects and files are permanently deleted
CLOSED_ACCOUNT_EXPIRATION=1
#ACCOUNT_EXPIRATION=5 # time in days after user closed his account to all projects and files are permanently deleted
ACCOUNT_EXPIRATION=1

#DELETED_PROJECT_EXPIRATION=7 # lifetime of deleted project, expired project are removed permanently without restore possibility, in days

Expand Down
4 changes: 2 additions & 2 deletions deployment/enterprise/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ CELERYD_PREFETCH_MULTIPLIER=4

# various life times

#CLOSED_ACCOUNT_EXPIRATION=5 # time in days after user closed his account to all projects and files are permanently deleted
CLOSED_ACCOUNT_EXPIRATION=1
#ACCOUNT_EXPIRATION=5 # time in days after user closed his account to all projects and files are permanently deleted
ACCOUNT_EXPIRATION=1

#DELETED_PROJECT_EXPIRATION=7 # lifetime of deleted project, expired project are removed permanently without restore possibility, in days

Expand Down
1 change: 1 addition & 0 deletions server/mergin/sync/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,5 +575,6 @@ def get_x_accel_uri(*url_parts):
# if the path parts_join starts with local_projects, remove it
if url.startswith(local_projects):
url = os.path.relpath(url, local_projects)
url = url.lstrip(os.path.sep)
result = os.path.join(download_accell_uri, url)
return result
6 changes: 6 additions & 0 deletions server/mergin/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,12 @@ def test_get_x_accell_uri(client):
url_parts = ()
assert get_x_accel_uri(*url_parts) == "/download"

url_parts = ("/archive", "cc900b78-a8b2-4e80-b546-74c96584bd10-v4.zip")
assert (
get_x_accel_uri(*url_parts)
== "/download/archive/cc900b78-a8b2-4e80-b546-74c96584bd10-v4.zip"
)


def test_save_diagnostic_log_file(client, app):
"""Test save diagnostic log file"""
Expand Down
Loading