Use env variables for settings.py variables

.env.sample

@@ -0,0 +1,8 @@
+HOST=localhost
+SECRET_KEY=7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp(
+TG_BOT_TOKEN=
+EMAIL_HOST=
+EMAIL_PASSWD=
+DB_USER=postgres
+DB_PASSWD=postgres
+DB_PORT=5432

.gitignore

@@ -1,5 +1,5 @@
 *.swp
-sikweb/settings.py
+.env
 *~
 *.pyc
 *.sqlite3

sikweb/.ci-settings.py

@@ -1,14 +0,0 @@
-"""File containing CI settings."""
-
-from sikweb.default_settings import *
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'ci',
-        'USER': 'postgres',
-        'PASSWORD': 'postgres',
-        'HOST': 'postgres',
-        'PORT': '5432',
-    },
-}

sikweb/settings-sample.py

@@ -1,75 +0,0 @@
-
-"""
-Django settings for sikweb project.
-
-Generated by 'django-admin startproject' using Django 1.9.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.9/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.9/ref/settings/
-"""
-
-from sikweb.base import *
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-# ALLOWED_HOSTS = ["*"]
-URL = "sika.sik.party"
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp('
-
-# MQTT settings
-MQTT_SETTINGS = {
-    'HOST': 'mqtt.sik.party',
-    'PORT': 1883,
-    'TOPICS': {
-        'BREW_TIME': 'sik/kiltahuone/kahvivaaka/brewtime',
-        'WEIGHT': 'sik/kiltahuone/kahvivaaka/weight',
-        'BREWING': 'sik/kiltahuone/kahvivaaka/brewing',
-        'CUPS': 'sik/kiltahuone/kahvivaaka/cups',
-    }
-}
-
-# ReCaptcha
-# http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/
-GOOGLE_RECAPTCHA_SITE_KEY = "YOUR-PUBLIC-KEY"
-GOOGLE_RECAPTCHA_SECRET_KEY = "YOUR-PRIVATE-KEY"
-
-# Email settings (more settings in base.py)
-EMAIL_HOST_USER = '<gmailtunnarisi>@gmail.com'
-EMAIL_HOST_PASSWORD = '<gmail_passu>'
-DEFAULT_EMAIL_FROM = 'SIK Viestintä <sikviestinta@gmail.com>'
-ENABLE_AUTOMATIC_EMAILS = False
-
-# Token for Telegram bot
-TELEGRAM_BOT_TOKEN = "<BOT_TOKEN>"
-
-# Database settings
-# Only uncomment if default settings in base.py are not ok
-
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-#         'NAME': 'sik',
-#         'USER': 'sik',
-#         'PASSWORD': 'password123',
-#         'HOST': 'localhost',
-#         'PORT': '5432',
-#         'TEST': {
-#             'NAME': 'sik_test',
-#         },
-#     },
-# }
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'mydatabase',
-        'TEST': {
-            'NAME': 'sik_test',
-        },
-    }
-}

sikweb/settings.py

@@ -14,27 +14,27 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
 from sikweb.base import *
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = os.getenv('DEBUG', False) == 'True'
 
-ALLOWED_HOSTS = ["sika.sik.party"]
-URL = "sika.sik.party"
+URL = os.getenv("HOST", "sika.sik.party")
+ALLOWED_HOSTS = [URL]
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.getenv('SECRET_KEY', '<your secret key>')
 
 # ReCaptcha
 # http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/
-GOOGLE_RECAPTCHA_SITE_KEY = "YOUR-PUBLIC-KEY"
-GOOGLE_RECAPTCHA_SECRET_KEY = "YOUR-PRIVATE-KEY"
+GOOGLE_RECAPTCHA_SITE_KEY = os.getenv("GOOGLE_RECAPTCHA_SITE_KEY", "YOUR-PUBLIC-KEY")
+GOOGLE_RECAPTCHA_SECRET_KEY = os.getenv("GOOGLE_RECAPTCHA_SECRET_KEY", "YOUR-PRIVATE-KEY")
 
 # Email settings (more settings in base.py)
-EMAIL_HOST_USER = 'sikviestinta@gmail.com'
+EMAIL_HOST_USER = os.getenv('EMAIL_HOST', 'sikviestinta@gmail.com')
 EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWD', '<gmail_passu>')
 DEFAULT_EMAIL_FROM = 'SIK Viestintä <sikviestinta@gmail.com>'
 ENABLE_AUTOMATIC_EMAILS = True
 
 # Token for Telegram bot
-TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN')
+TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN', '<tg token>')
 
 # Database settings
 # Only uncomment if default settings in base.py are not ok
@@ -42,10 +42,10 @@ TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN')
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': os.getenv('DB_USER', '<none>'),
-        'USER': os.getenv('DB_USER', '<none>'),
-        'PASSWORD': os.getenv('DB_PASSWD', '<none>'),
-        'HOST': os.getenv('DB_HOST', '127.0.0.1'),
+        'NAME': os.getenv('DB_USER', 'postgres'),
+        'USER': os.getenv('DB_USER', 'postgres'),
+        'PASSWORD': os.getenv('DB_PASSWD', 'postgres'),
+        'HOST': os.getenv('DB_HOST', 'localhost'),
         'PORT': os.getenv('DB_PORT', 5432),
     }
 }