diff --git a/.env.example b/.env.example index d0971660e..1bf6d5406 100644 --- a/.env.example +++ b/.env.example @@ -138,9 +138,9 @@ TWO_FACTOR_LOGIN_MAX_SECONDS=60 # Value should be a comma-separated list of host names. CSP_ADDITIONAL_HOSTS= -# The last number here means "megabytes" -# Increase if users are having trouble uploading BookWyrm export files. -DATA_UPLOAD_MAX_MEMORY_SIZE = (1024**2 * 100) - # Time before being logged out (in seconds) # SESSION_COOKIE_AGE=2592000 # current default: 30 days + +# Maximum allowed memory for file uploads (increase if users are having trouble +# uploading BookWyrm export files). +# DATA_UPLOAD_MAX_MEMORY_MiB=100 diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7f45573c9..2bb68ff85 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -446,4 +446,6 @@ if HTTP_X_FORWARDED_PROTO: # user with the same username - in which case you should change it! INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" -DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_SIZE", (1024**2 * 100)) +# We only allow specifying DATA_UPLOAD_MAX_MEMORY_SIZE in MiB from .env +# (note the difference in variable names). +DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_MiB", 100) << 20 diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html index cd3119e3e..955cff656 100644 --- a/bookwyrm/templates/preferences/export-user.html +++ b/bookwyrm/templates/preferences/export-user.html @@ -14,31 +14,29 @@

{% trans "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." %}

- {% blocktrans trimmed %}
-

Your file will include:

+

{% trans "Your file will include:" %}

-

Your file will not include:

+

{% trans "Your file will not include:" %}

- {% endblocktrans %}

{% trans "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." %}

@@ -49,6 +47,13 @@ {% if not site.user_exports_enabled %}

{% trans "New user exports are currently disabled." %} + {% if perms.bookwyrm.edit_instance_settings %} +
+ {% url 'settings-imports' as url %} + {% blocktrans trimmed %} + User exports settings can be changed from the Imports page in the Admin dashboard. + {% endblocktrans %} + {% endif%}

{% elif next_available %}

diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 230db366e..d1d849cb8 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -126,7 +126,7 @@ def id_to_username(user_id): value = f"{name}@{domain}" return value - return "a new user account" + return _("a new user account") @register.filter(name="get_file_size") diff --git a/nginx/development b/nginx/development index fdfd14e1d..2c3a1d02f 100644 --- a/nginx/development +++ b/nginx/development @@ -61,17 +61,25 @@ server { proxy_pass http://web; } - # directly serve images and static files from the + # directly serve static files from the # bookwyrm filesystem using sendfile. # make the logs quieter by not reporting these requests - location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|ttf|webp|css|js)$ { + location ~ ^/static/ { root /app; try_files $uri =404; add_header X-Cache-Status STATIC; access_log off; } - # block access to any non-image files from images or static + # same with image files not in static folder + location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { + root /app; + try_files $uri =404; + add_header X-Cache-Status STATIC; + access_log off; + } + + # block access to any non-image files from images location ~ ^/images/ { return 403; } diff --git a/nginx/production b/nginx/production index a1ddc7d4a..841ed8afa 100644 --- a/nginx/production +++ b/nginx/production @@ -93,19 +93,27 @@ server { # proxy_pass http://web; # } # -# # directly serve images and static files from the +# # directly serve static files from the # # bookwyrm filesystem using sendfile. # # make the logs quieter by not reporting these requests -# location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|ttf|webp|css|js|woff|ttf)$ { +# location ~ ^/static/ { # root /app; # try_files $uri =404; # add_header X-Cache-Status STATIC; # access_log off; # } -# # block access to any non-image files from images or static -# location ~ ^/(images|static)/ { -# return 403; +# # same with image files not in static folder +# location ~ \.(bmp|ico|jpg|jpeg|png|svg|tif|tiff|webp)$ { +# root /app; +# try_files $uri =404; +# add_header X-Cache-Status STATIC; +# access_log off; +# } + +# # block access to any non-image files from images +# location ~ ^/images/ { +# return 403; # } # # # monitor the celery queues with flower, no caching enabled