diff --git a/.gitignore b/.gitignore index a385b2b..ba1bdd8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,5 @@ coverage.xml # Celery celerybeat-schedule -/config_app/settings/dev.env -/config_app/settings/test.env +/config_app/settings/local.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/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://:@127.0.0.1:5432/' +EMAIL_URL='smtp+tls://:@smtp.gmail.com:587' +CACHE_URL=rediscache://127.0.0.1:6379/?client_class=django_redis.client.DefaultClient \ No newline at end of file diff --git a/lms/settings.py b/lms/settings.py index af601a0..e453ca3 100644 --- a/lms/settings.py +++ b/lms/settings.py @@ -8,22 +8,10 @@ import socket root = environ.Path(__file__) - 2 env = environ.Env() -MOD = os.environ.get('MOD', 'Prod') -DEBUG = os.environ.get('DEBUG', 'False') -MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1') - -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') +environ.Env.read_env(str(root) + '/config_app/settings/local.env') -elif MOD == 'Prod': - environ.Env.read_env(str(root) + '/config_app/settings/prod.env') - -else: - raise ImportError('no such environ ' + MOD) +MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1') EMAIL_CONFIG = env.email_url('EMAIL_URL',) vars().update(EMAIL_CONFIG)