Merge branch 'pre-release/1.3.0' into develop

api/Dockerfile

@@ -114,8 +114,6 @@ WORKDIR /app
 RUN set -eux; \
   pip3 install --no-deps --editable .
 
-ENV CACHE_URL="redis://redis:6379/0"
-ENV CELERY_BROKER_URL="redis://redis:6379/0"
 ENV IS_DOCKER_SETUP=true
 
 CMD ["./docker/server.sh"]

api/config/settings/common.py

@@ -14,6 +14,7 @@ APPS_DIR = ROOT_DIR.path("funkwhale_api")
 env = environ.Env()
 ENV = env
 LOGLEVEL = env("LOGLEVEL", default="info").upper()
+IS_DOCKER_SETUP = env.bool("IS_DOCKER_SETUP", False)
 
 
 if env("FUNKWHALE_SENTRY_DSN", default=None) is not None:
@@ -374,7 +375,7 @@ vars().update(EMAIL_CONFIG)
 # The `_database_url_docker` variable will only by used as default for DATABASE_URL
 # in the context of a docker deployment.
 _database_url_docker = None
-if env.bool("IS_DOCKER_SETUP", False) and env.str("DATABASE_URL", None) is None:
+if IS_DOCKER_SETUP and env.str("DATABASE_URL", None) is None:
     warnings.warn(
         DeprecationWarning(
             "the automatically generated 'DATABASE_URL' configuration in the docker "
@@ -803,8 +804,11 @@ if AUTH_LDAP_ENABLED:
 # SLUGLIFIER
 AUTOSLUG_SLUGIFY_FUNCTION = "slugify.slugify"
 
-CACHE_DEFAULT = "redis://127.0.0.1:6379/0"
-CACHE_URL = env.cache_url("CACHE_URL", default=CACHE_DEFAULT)
+CACHE_URL_DEFAULT = "redis://127.0.0.1:6379/0"
+if IS_DOCKER_SETUP:
+    CACHE_URL_DEFAULT = "redis://redis:6379/0"
+
+CACHE_URL = env.str("CACHE_URL", default=CACHE_URL_DEFAULT)
 """
 The URL of your redis server. For example:
 
@@ -818,17 +822,25 @@ If you're using password auth (the extra slash is important)
 .. note::
 
     If you want to use Redis over unix sockets, you also need to update
-    :attr:`CELERY_BROKER_URL`
+    :attr:`CELERY_BROKER_URL`, because the scheme differ from the one used by
+    :attr:`CACHE_URL`.
 
 """
 CACHES = {
-    "default": CACHE_URL,
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": CACHE_URL,
+        "OPTIONS": {
+            "CLIENT_CLASS": "funkwhale_api.common.cache.RedisClient",
+            "IGNORE_EXCEPTIONS": True,  # mimics memcache behavior.
+            # http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
+        },
+    },
     "local": {
         "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
         "LOCATION": "local-cache",
     },
 }
-CACHES["default"]["BACKEND"] = "django_redis.cache.RedisCache"
 
 CHANNEL_LAYERS = {
     "default": {
@@ -837,17 +849,12 @@ CHANNEL_LAYERS = {
     }
 }
 
-CACHES["default"]["OPTIONS"] = {
-    "CLIENT_CLASS": "funkwhale_api.common.cache.RedisClient",
-    "IGNORE_EXCEPTIONS": True,  # mimics memcache behavior.
-    # http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
-}
 CACHEOPS_DURATION = env("CACHEOPS_DURATION", default=0)
 CACHEOPS_ENABLED = bool(CACHEOPS_DURATION)
 
 if CACHEOPS_ENABLED:
     INSTALLED_APPS += ("cacheops",)
-    CACHEOPS_REDIS = env("CACHE_URL", default=CACHE_DEFAULT)
+    CACHEOPS_REDIS = CACHE_URL
     CACHEOPS_PREFIX = lambda _: "cacheops"  # noqa
     CACHEOPS_DEFAULTS = {"timeout": CACHEOPS_DURATION}
     CACHEOPS = {
@@ -858,9 +865,7 @@ if CACHEOPS_ENABLED:
 
 # CELERY
 INSTALLED_APPS += ("funkwhale_api.taskapp.celery.CeleryConfig",)
-CELERY_BROKER_URL = env(
-    "CELERY_BROKER_URL", default=env("CACHE_URL", default=CACHE_DEFAULT)
-)
+CELERY_BROKER_URL = env.str("CELERY_BROKER_URL", default=CACHE_URL)
 """
 The celery task broker URL. Defaults to :attr:`CACHE_URL`.
 You don't need to tweak this unless you want