Description: Patch settings to fit in Debian system
Author: Jan-Pascal van Best <janpascal@vanbest.org>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/tweet_django/settings.py
+++ b/tweet_django/settings.py
@@ -20,13 +20,10 @@
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'gho@vr!guh#ylqdi4(voavn+*lzyvm&91xnz9c-x6yol5ye%s='
-
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['127.0.0.1']
 
 
 # Application definition
@@ -57,7 +54,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': ['/usr/share/tweet-django/templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -109,41 +106,21 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
-STATIC_URL = '/static/'
-
-# Application specific settings
-
-TWEET_BASEPATH = 'results'
-
-
-config = ConfigParser()
-config.read(os.path.join(BASE_DIR, 'tweet_django', 'local.ini'))
-
-DATABASES = {
-    'default': {
-        'ENGINE': config.get('database', 'ENGINE'),
-        'NAME': config.get('database', 'NAME'),
-        'USER': config.get('database', 'USER'),
-        'PASSWORD': config.get('database', 'PASSWORD'),
-        'HOST': config.get('database', 'HOST'),
-        'OPTIONS': {'charset': 'utf8mb4'},
-    }
-}
-
-TWEET_BASEPATH = config.get('paths', 'TWEET_BASEPATH')
-
-TWEET_OAUTH_CONSUMER_KEY = config.get('twitter', 'TWEET_OAUTH_CONSUMER_KEY')
-TWEET_OAUTH_CONSUMER_SECRET = config.get('twitter', 'TWEET_OAUTH_CONSUMER_SECRET')
-TWEET_OAUTH_ACCESS_TOKEN = config.get('twitter', 'TWEET_OAUTH_ACCESS_TOKEN')
-TWEET_OAUTH_ACCESS_TOKEN_SECRET = config.get('twitter', 'TWEET_OAUTH_ACCESS_TOKEN_SECRET')
-
-TWEET_MAPQUEST_API_KEY = config.get('geo', 'TWEET_MAPQUEST_API_KEY')
+STATIC_URL = '/tweet-django/static/'
 
 # Logging
 
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s [%(asctime)s] %(module)s %(process)d %(thread)d %(message)s'
+        },
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        },
+    },
     'handlers': {
         'console': {
             'class': 'logging.StreamHandler',
@@ -151,19 +128,36 @@
         'file': {
             'level': 'DEBUG',
             'class': 'logging.FileHandler',
-            'filename': 'django_debug.log',
+            'filename': '/var/log/tweet-django/tweet-django.log',
+            'formatter': 'verbose'
         },
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+        }
     },
     'loggers': {
         'django': {
-            'handlers': ['console'],
-            'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
+            'handlers': ['file', 'mail_admins'],
+            'level': os.getenv('DJANGO_LOG_LEVEL', 'WARNING'),
             'propagate': True
         },
         'tweet': {
-            'handlers': ['console'],
-            'level': os.getenv('DJANGO_LOG_LEVEL', 'DEBUG'),
+            'handlers': ['file', 'mail_admins'],
+            'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
             'propagate': True
         },
     },
 }
+
+# Default paths
+TWEET_BASEPATH = '/var/lib/tweet-django'
+STATIC_ROOT = '/usr/share/tweet-django/static'
+STATIC_URL = '/tweet-django/static/'
+
+# Database settings, provided by dbconfig_common
+if os.path.exists("/etc/tweet-django/dbsettings.py"):
+    exec(open("/etc/tweet-django/dbsettings.py").read())
+
+if os.path.exists("/etc/tweet-django/settings.py"):
+    exec(open("/etc/tweet-django/settings.py").read())
