From ba335a0f38df3f4ec36d96f1374577528d1bd085 Mon Sep 17 00:00:00 2001
From: Pierros Papadeas <pierros@papadeas.gr>
Date: Tue, 13 Nov 2018 13:33:42 +0100
Subject: [PATCH] Clean up settings.py and env-dist file

---
 env-dist            | 45 +++++++--------------------------------------
 network/settings.py | 11 ++++++-----
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/env-dist b/env-dist
index 914c36d..fb7948d 100644
--- a/env-dist
+++ b/env-dist
@@ -1,43 +1,12 @@
-ENVIRONMENT='dev'
-DEBUG=True
+# Overriding settings.py values.
+# Uncomment values for usage.
 
-# Email
-DEFAULT_FROM_EMAIL=SatNOGS <noreply@satnogs.org>
-ADMINS_FROM_NAME=Admins
-ADMINS_FROM_EMAIL=noreply@satnogs.org
+# ENVIRONMENT='dev'
+# DEBUG=True
 
 # Security
-SECRET_KEY=something_long_and_random
-ALLOWED_HOSTS=localhost
-
-# Database
-DATABASE_URL='sqlite:///db.sqlite3'
+# SECRET_KEY=changeme
+# ALLOWED_HOSTS=localhost
 
 # Mapbox
-MAPBOX_TOKEN=enter_mapbox_token_here
-MAPBOX_MAP_ID=pierros.jbf6la1j
-
-# Application
-DB_API_ENDPOINT='https://db.satnogs.org/api/'
-
-# Cache
-CACHE_BACKEND = 'django.core.cache.backends.locmem.LocMemCache'
-CACHE_LOCATION = 'unique-snowflake'
-CACHE_CLIENT_CLASS = None
-
-# Celery
-CELERY_BROKER_URL=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/0
-
-# Archive.org
-#S3_ACCESS_KEY='s3_access_key'
-#S3_SECRET_KEY='s3_secret_key'
-#ARCHIVE_COLLECTION='collection_name'
-
-# Compressor
-COMPRESS_ENABLED=False
-COMPRESS_OFFLINE=False
-
-# Raven - sentry
-RAVEN_ENABLED=False
-#RAVEN_DSN='sentry_dsn'
+# MAPBOX_TOKEN=enter_mapbox_token_here
diff --git a/network/settings.py b/network/settings.py
index e6c0cff..1609e61 100644
--- a/network/settings.py
+++ b/network/settings.py
@@ -7,7 +7,7 @@ import raven
 ROOT = Path(__file__).parent.parent
 
 ENVIRONMENT = config('ENVIRONMENT', default='dev')
-DEBUG = config('DEBUG', default=False, cast=bool)
+DEBUG = config('DEBUG', default=True, cast=bool)
 
 # Apps
 DJANGO_APPS = (
@@ -70,12 +70,13 @@ SERVER_EMAIL = DEFAULT_FROM_EMAIL
 # Cache
 CACHES = {
     'default': {
-        'BACKEND': config('CACHE_BACKEND', default='redis_cache.RedisCache'),
-        'LOCATION': config('CACHE_LOCATION', default='unix://var/run/redis/redis.sock'),
+        'BACKEND': config('CACHE_BACKEND',
+                          default='django.core.cache.backends.locmem.LocMemCache'),
+        'LOCATION': config('CACHE_LOCATION', default='unique-location'),
         'OPTIONS': {
             'MAX_ENTRIES': 5000,
             'CLIENT_CLASS': config('CACHE_CLIENT_CLASS',
-                                   default='django_redis.client.DefaultClient'),
+                                   default=''),
         },
         'KEY_PREFIX': 'network-{0}'.format(ENVIRONMENT),
     }
@@ -319,7 +320,7 @@ if DATABASES['default']['ENGINE'].split('.')[-1] == 'mysql':
 
 # Mapbox API
 MAPBOX_GEOCODE_URL = 'https://api.tiles.mapbox.com/v4/geocode/mapbox.places/'
-MAPBOX_MAP_ID = config('MAPBOX_MAP_ID', default='')
+MAPBOX_MAP_ID = config('MAPBOX_MAP_ID', default='pierros.jbf6la1j')
 MAPBOX_TOKEN = config('MAPBOX_TOKEN', default='')
 
 # Observations settings