From 866855ddd2aa2c098e1a12ee5f54842fd5aebda8 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Mon, 26 Mar 2018 14:18:34 +0300
Subject: [PATCH 1/3] finance logging

---
 .gitignore                            |  2 +-
 config_app/settings/prod.env.skeleton |  5 +++++
 lms/settings.py                       | 14 +-------------
 3 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 config_app/settings/prod.env.skeleton

diff --git a/.gitignore b/.gitignore
index f55a249..92dfddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,4 @@ coverage.xml
 
 # Celery
 celerybeat-schedule
-/config_app/settings/dev.env
+/config_app/settings/local.env
diff --git a/config_app/settings/prod.env.skeleton b/config_app/settings/prod.env.skeleton
new file mode 100644
index 0000000..0f438fb
--- /dev/null
+++ b/config_app/settings/prod.env.skeleton
@@ -0,0 +1,5 @@
+DEBUG=False
+SECRET_KEY='....'
+DATABASE_URL='psql://<name>:<password>@127.0.0.1:5432/<db_name>'
+EMAIL_URL='smtp+tls://<name>:<password>@smtp.gmail.com:587'
+CACHE_URL=rediscache://127.0.0.1:6379/<db>?client_class=django_redis.client.DefaultClient
\ No newline at end of file
diff --git a/lms/settings.py b/lms/settings.py
index b4ae38d..c9310e3 100644
--- a/lms/settings.py
+++ b/lms/settings.py
@@ -8,20 +8,8 @@ import socket
 root = environ.Path(__file__) - 2
 env = environ.Env()
 
-MOD = os.environ.get('MOD', 'Prod')
-DEBUG = os.environ.get('DEBUG', 'False')
 
-if MOD == 'Test':
-    environ.Env.read_env(str(root) + '/config_app/settings/test.env')
-
-elif MOD == 'Dev':
-    environ.Env.read_env(str(root) + '/config_app/settings/dev.env')
-
-elif MOD == 'Prod':
-    environ.Env.read_env(str(root) + '/config_app/settings/prod.env')
-
-else:
-    raise ImportError('no such environ ' + MOD)
+environ.Env.read_env(str(root) + '/config_app/settings/local.env')
 
 EMAIL_CONFIG = env.email_url('EMAIL_URL',)
 vars().update(EMAIL_CONFIG)

From c67385c21c9528ab01f75e9fd2edada77549b720 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Mon, 26 Mar 2018 14:38:31 +0300
Subject: [PATCH 2/3] finance logging

---
 Envoy.blade.php              | 9 ++++++---
 config_app/settings/prod.env | 5 -----
 config_app/settings/test.env | 5 -----
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 config_app/settings/prod.env
 delete mode 100644 config_app/settings/test.env

diff --git a/Envoy.blade.php b/Envoy.blade.php
index d3d66be..0564a73 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -29,9 +29,12 @@ echo '{{ $new_release_dir }}'
 
 @task('create_symlinks', ['on' => 'localhost'])
 echo '>> Создание симлинков'
-@if ($branch)
-    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/prod.env
-    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/dev.env
+@if ($branch == 'master')
+    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/local.env
+    ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
+@endif
+@if ($branch == 'dev')
+    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/local.env
     ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
 @endif
 @endtask
diff --git a/config_app/settings/prod.env b/config_app/settings/prod.env
deleted file mode 100644
index 6f33e00..0000000
--- a/config_app/settings/prod.env
+++ /dev/null
@@ -1,5 +0,0 @@
-DEBUG=False
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://team:nu5Xefise@127.0.0.1:5432/new_lms'
-EMAIL_URL='smtp+tls://robo@skillbox.ru:nu5Xefise@smtp.gmail.com:587'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient
\ No newline at end of file
diff --git a/config_app/settings/test.env b/config_app/settings/test.env
deleted file mode 100644
index 5b922cf..0000000
--- a/config_app/settings/test.env
+++ /dev/null
@@ -1,5 +0,0 @@
-DEBUG=True
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://postgres@127.0.0.1:5432/test_lms'
-EMAIL_URL='smtp+tls://9ae31a1a770138:a7d79ee373a14c@smtp.mailtrap.io:2525'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient
\ No newline at end of file

From 031ab8914e4fdccfcc191e15dc518a6eaca05ba9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Mon, 26 Mar 2018 14:40:11 +0300
Subject: [PATCH 3/3] finance logging

---
 lms/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/settings.py b/lms/settings.py
index c9310e3..778f639 100644
--- a/lms/settings.py
+++ b/lms/settings.py
@@ -11,6 +11,8 @@ env = environ.Env()
 
 environ.Env.read_env(str(root) + '/config_app/settings/local.env')
 
+MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1')
+
 EMAIL_CONFIG = env.email_url('EMAIL_URL',)
 vars().update(EMAIL_CONFIG)