summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoderick142017-06-13 01:28:28 +0530
committercoderick142017-06-13 01:28:28 +0530
commit1950845ac1e7c253f9476bdbbca8e3b8b6f27dbc (patch)
treead6a70c13f8c5be80e966b9b044d601ccd7daf51
parent8d487bfad2bfaf0234c51ec8233d800426e7d23a (diff)
downloadSBHS-2018-Rpi-1950845ac1e7c253f9476bdbbca8e3b8b6f27dbc.tar.gz
SBHS-2018-Rpi-1950845ac1e7c253f9476bdbbca8e3b8b6f27dbc.tar.bz2
SBHS-2018-Rpi-1950845ac1e7c253f9476bdbbca8e3b8b6f27dbc.zip
Remove database credentials from settings.py
-rw-r--r--sbhs_server/credentials.py.example8
-rw-r--r--sbhs_server/settings.py17
2 files changed, 13 insertions, 12 deletions
diff --git a/sbhs_server/credentials.py.example b/sbhs_server/credentials.py.example
index 255bbae..4597033 100644
--- a/sbhs_server/credentials.py.example
+++ b/sbhs_server/credentials.py.example
@@ -3,4 +3,10 @@ EMAIL_HOST_USER = 'username'
EMAIL_HOST_PASSWORD = 'password'
MAP_FILE = 'path/to/file/map_machine_ids.txt'
LOG_FILE = '/path/to/logfile'
-ADMIN_EMAIL='admin email' \ No newline at end of file
+ADMIN_EMAIL='admin email'
+DB_NAME = 'your database name'
+DB_USER = 'database username'
+DB_PASS = 'password'
+DB_HOST = 'database host'
+DB_PORT = 'database port'
+
diff --git a/sbhs_server/settings.py b/sbhs_server/settings.py
index 7c03dfa..3625fc1 100644
--- a/sbhs_server/settings.py
+++ b/sbhs_server/settings.py
@@ -62,8 +62,7 @@ INSTALLED_APPS = (
'undelete',
#'yaksh',
'taggit',
- #'corsheaders'
- 'django_crontab',
+ #'corsheaders',
'account',
'myadmin',
@@ -99,11 +98,11 @@ if is_production:
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
- 'NAME': 'database_name',
- 'USER': 'username',
- 'PASSWORD': 'password',
- 'HOST': 'localhost',
- 'PORT': '3306',
+ 'NAME': credentials.DB_NAME,
+ 'USER': credentials.DB_USER,
+ 'PASSWORD': credentials.DB_PASS,
+ 'HOST': credentials.DB_HOST,
+ 'PORT': credentials.DB_PORT,
}
}
else:
@@ -186,10 +185,6 @@ TEMPLATES = [
},
]
-CRONJOBS = [
- ('2 * * * *', 'maintenance.health_monitor.main', '>> /tmp/health_monitor.log'),
-]
-
import warnings
warnings.filterwarnings(
'ignore', r"DateTimeField .* received a naive datetime",