From c4c260c41d0c06644dca6e1b0d40c7e27d65aebe Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 18 Feb 2018 17:52:16 +0300 Subject: [PATCH 1/4] migrate update --- lms/settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/settings.py b/lms/settings.py index 72e5901..7e0dc08 100644 --- a/lms/settings.py +++ b/lms/settings.py @@ -122,11 +122,11 @@ MIDDLEWARE_CLASSES = [ # 'access.middleware.UpdateActivity', ] -REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': ( - 'rest_framework.authentication.SessionAuthentication' - ) -} +# REST_FRAMEWORK = { +# 'DEFAULT_AUTHENTICATION_CLASSES': ( +# 'rest_framework.authentication.SessionAuthentication' +# ) +# } ROOT_URLCONF = 'lms.urls' @@ -180,5 +180,5 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_URL = '/static/' RAVEN_CONFIG = { - 'dsn': 'http://caaea487274f4e23a9107862484c79f3:3d463ad4717942508536f7a659921950@sentry.skillbox.ru/3' + 'dsn': 'http://1a09557dbd144e52af4b14bea569c114:fbb5dfaa39e64f02a1b4cc7ac665d7d7@sentry.skillbox.ru/7' } From b213fe1190123dc827adbf1719b8dca288c51215 Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 15:22:50 +0000 Subject: [PATCH 2/4] Delete dev.env --- config_app/settings/dev.env | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config_app/settings/dev.env diff --git a/config_app/settings/dev.env b/config_app/settings/dev.env deleted file mode 100644 index 4207109..0000000 --- a/config_app/settings/dev.env +++ /dev/null @@ -1,5 +0,0 @@ -DEBUG=True -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 From 5b8c67c0af33ab098730e818ba512798e1bfb186 Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 15:24:08 +0000 Subject: [PATCH 3/4] Update Envoy.blade.php --- Envoy.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Envoy.blade.php b/Envoy.blade.php index 9c1d597..8532349 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -36,6 +36,7 @@ echo '>> Запускаем тесты' @task('update_symlinks', ['on' => 'localhost']) @if ($branch) ln -nfs {{ $app_dir }}/configs/{{ $branch }}/wsgi.py {{ $new_release_dir }}/lms/wsgi.py + ln -nfs {{ $app_dir }}/configs/{{ $branch }}/{{ $branch }}.env {{ $new_release_dir }}/config_app/settings/{{ $branch }}.env echo '>> Создаем симлинк на папку текущего релиза' ln -nfs {{ $new_release_dir }} {{ $app_dir }}/current_{{ $branch }} echo '>> restart Supervisor' From 98dd9ebd504999052839684ea547e1b75b7c3b9f Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 15:26:32 +0000 Subject: [PATCH 4/4] Update Envoy.blade.php --- Envoy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envoy.blade.php b/Envoy.blade.php index 8532349..d60aa50 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -22,6 +22,7 @@ echo '{{ $new_release_dir }}' [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }} @if ($branch) git clone -b {{ $branch }} {{ $repository }} {{ $new_release_dir }} + ln -nfs {{ $app_dir }}/configs/{{ $branch }}/{{ $branch }}.env {{ $new_release_dir }}/config_app/settings/{{ $branch }}.env @endif @endtask @@ -36,7 +37,6 @@ echo '>> Запускаем тесты' @task('update_symlinks', ['on' => 'localhost']) @if ($branch) ln -nfs {{ $app_dir }}/configs/{{ $branch }}/wsgi.py {{ $new_release_dir }}/lms/wsgi.py - ln -nfs {{ $app_dir }}/configs/{{ $branch }}/{{ $branch }}.env {{ $new_release_dir }}/config_app/settings/{{ $branch }}.env echo '>> Создаем симлинк на папку текущего релиза' ln -nfs {{ $new_release_dir }} {{ $app_dir }}/current_{{ $branch }} echo '>> restart Supervisor'