|
335 | 335 | # 'django.contrib.staticfiles.finders.DefaultStorageFinder', |
336 | 336 | ) |
337 | 337 |
|
| 338 | +MEMCACHED_ENABLED = ast.literal_eval(os.getenv("MEMCACHED_ENABLED", "False")) |
| 339 | +MEMCACHED_BACKEND = os.getenv("MEMCACHED_BACKEND", "django.core.cache.backends.memcached.PyLibMCCache") |
| 340 | +MEMCACHED_LOCATION = os.getenv("MEMCACHED_LOCATION", "127.0.0.1:11211") |
| 341 | +MEMCACHED_LOCK_EXPIRE = int(os.getenv("MEMCACHED_LOCK_EXPIRE", 3600)) |
| 342 | +MEMCACHED_LOCK_TIMEOUT = int(os.getenv("MEMCACHED_LOCK_TIMEOUT", 10)) |
| 343 | + |
338 | 344 | CACHES = { |
339 | 345 | # DUMMY CACHE FOR DEVELOPMENT |
340 | 346 | "default": { |
341 | 347 | "BACKEND": "django.core.cache.backends.dummy.DummyCache", |
342 | 348 | }, |
| 349 | + "memcached": { |
| 350 | + "BACKEND": MEMCACHED_BACKEND, |
| 351 | + "LOCATION": MEMCACHED_LOCATION |
| 352 | + }, |
343 | 353 | # MEMCACHED EXAMPLE |
344 | 354 | # 'default': { |
345 | 355 | # 'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache', |
|
371 | 381 | }, |
372 | 382 | } |
373 | 383 |
|
374 | | -# Whitenoise Settings - ref.: http://whitenoise.evans.io/en/stable/django.html |
375 | | -WHITENOISE_MANIFEST_STRICT = ast.literal_eval(os.getenv("WHITENOISE_MANIFEST_STRICT", "False")) |
376 | | -COMPRESS_STATIC_FILES = ast.literal_eval(os.getenv("COMPRESS_STATIC_FILES", "False")) |
377 | | - |
378 | | -MEMCACHED_ENABLED = ast.literal_eval(os.getenv("MEMCACHED_ENABLED", "False")) |
379 | | -MEMCACHED_BACKEND = os.getenv("MEMCACHED_BACKEND", "django.core.cache.backends.memcached.PyLibMCCache") |
380 | | -MEMCACHED_LOCATION = os.getenv("MEMCACHED_LOCATION", "127.0.0.1:11211") |
381 | | -MEMCACHED_LOCK_EXPIRE = int(os.getenv("MEMCACHED_LOCK_EXPIRE", 3600)) |
382 | | -MEMCACHED_LOCK_TIMEOUT = int(os.getenv("MEMCACHED_LOCK_TIMEOUT", 10)) |
383 | | - |
384 | 384 | if MEMCACHED_ENABLED: |
385 | 385 | CACHES["default"] = { |
386 | 386 | "BACKEND": MEMCACHED_BACKEND, |
387 | 387 | "LOCATION": MEMCACHED_LOCATION, |
388 | 388 | } |
389 | 389 |
|
| 390 | +# Whitenoise Settings - ref.: http://whitenoise.evans.io/en/stable/django.html |
| 391 | +WHITENOISE_MANIFEST_STRICT = ast.literal_eval(os.getenv("WHITENOISE_MANIFEST_STRICT", "False")) |
| 392 | +COMPRESS_STATIC_FILES = ast.literal_eval(os.getenv("COMPRESS_STATIC_FILES", "False")) |
| 393 | + |
390 | 394 | # Define the STATICFILES_STORAGE accordingly |
391 | 395 | if not DEBUG and CACHE_BUSTING_STATIC_ENABLED: |
392 | 396 | STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" |
|
839 | 843 |
|
840 | 844 | MESSAGE_STORAGE = "django.contrib.messages.storage.cookie.CookieStorage" |
841 | 845 |
|
| 846 | +# Sessions |
| 847 | +SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer" |
| 848 | +SESSION_ENGINE = os.environ.get('SESSION_ENGINE', 'django.contrib.sessions.backends.db') |
| 849 | +if SESSION_ENGINE in ('django.contrib.sessions.backends.cached_db', 'django.contrib.sessions.backends.cached'): |
| 850 | + SESSION_CACHE_ALIAS = 'memcached' # use memcached cache if a cached backend is requested |
| 851 | + |
842 | 852 | # Security stuff |
843 | 853 | SESSION_EXPIRED_CONTROL_ENABLED = ast.literal_eval(os.environ.get("SESSION_EXPIRED_CONTROL_ENABLED", "True")) |
844 | 854 |
|
|
1228 | 1238 | "DETAIL": "never", |
1229 | 1239 | } |
1230 | 1240 |
|
1231 | | -SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer" |
1232 | | - |
1233 | 1241 | try: |
1234 | 1242 | # try to parse python notation, default in dockerized env |
1235 | 1243 | ALLOWED_HOSTS = ast.literal_eval(os.getenv("ALLOWED_HOSTS")) |
@@ -1939,6 +1947,7 @@ def get_geonode_catalogue_service(): |
1939 | 1947 | ) |
1940 | 1948 |
|
1941 | 1949 | ACCOUNT_OPEN_SIGNUP = ast.literal_eval(os.environ.get("ACCOUNT_OPEN_SIGNUP", "True")) |
| 1950 | +ACCOUNT_OPEN_SOCIALSIGNUP = ast.literal_eval(os.environ.get("ACCOUNT_OPEN_SOCIALSIGNUP", "True")) |
1942 | 1951 | ACCOUNT_APPROVAL_REQUIRED = ast.literal_eval(os.getenv("ACCOUNT_APPROVAL_REQUIRED", "False")) |
1943 | 1952 | ACCOUNT_ADAPTER = "geonode.people.adapters.LocalAccountAdapter" |
1944 | 1953 | ACCOUNT_AUTHENTICATION_METHOD = os.environ.get("ACCOUNT_AUTHENTICATION_METHOD", "username_email") |
|
0 commit comments