Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into add-django-axes
Roland Geider5e3167e3a2dc
diff --cc extras/docker/development/settings.pyindex f63cae05f,311fb3e02..b3c5a72b4--- a/extras/docker/development/settings.py+++ b/extras/docker/development/settings.py@@@ -116,9 -116,9 +116,16 @@@ COMPRESS_ROOT = STATIC_ROO# The site's domain as used by the email verification workflowEMAIL_PAGE_DOMAIN = 'http://localhost/'++# Django Axes+AXES_ENABLED = True # allow to disable axes entirely (e.g. if this is run in a local network or so we would save up some resources), but default is true+AXES_FAILURE_LIMIT = 5 # configurable, default is 5+AXES_COOLOFF_TIME = 0.5 # configurable, default is 0.5 hours+AXES_HANDLER = 'axes.handlers.cache.AxesCacheHandler' # Configurable, but default is the cache handler+++ #+ # Django Rest Framework SimpleJWT+ #+ SIMPLE_JWT['ACCESS_TOKEN_LIFETIME'] = timedelta(minutes=env.int("ACCESS_TOKEN_LIFETIME", 15))+ SIMPLE_JWT['REFRESH_TOKEN_LIFETIME'] = timedelta(hours=env.int("REFRESH_TOKEN_LIFETIME", 24))-SIMPLE_JWT['SIGNING_KEY'] = env.str("SIGNING_KEY", SECRET_KEY)++SIMPLE_JWT['SIGNING_KEY'] = env.str("SIGNING_KEY", SECRET_KEY)diff --cc requirements.txtindex f6bea32b8,c3eefb86a..810e6a997--- a/requirements.txt+++ b/requirements.txt@@@ -9,10 -9,9 +9,10 @@@ django-formtools~=2.django-recaptcha~=3.0.0Django~=3.2django-activity-stream~=1.4+django-axes==5.39.0django-crispy-forms~=1.14django-simple-history~=3.1- django-email-verification~=0.1.0+ django-email-verification~=0.3.1django_compressor~=4.1django_extensions~=3.2django-storages~=1.13