From 550767bb310373efb05a1e9f8ceca99110dcecbe Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Fri, 5 Nov 2021 23:03:16 +0300 Subject: [PATCH] gitlab --- .gitlab-ci.yml | 3 +++ Sprint/settings.py | 3 ++- config.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab20282..edb5b88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,9 @@ stages: - deploy-dev - deploy-prod +variables: + SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" + before_script: - echo "Starting..." diff --git a/Sprint/settings.py b/Sprint/settings.py index f4f425f..54fc524 100644 --- a/Sprint/settings.py +++ b/Sprint/settings.py @@ -11,7 +11,6 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ """ import os -from config import * # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -24,6 +23,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = "-w#*mn6*fa8a=(-c0@klx&$vl%hpiy&l(u*3%0a#2)wdt##(z2" # SECURITY WARNING: don't run with debug turned on in production! +DEPLOY = False DEBUG = not DEPLOY SECURE_SSL_REDIRECT = DEPLOY @@ -133,6 +133,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static") MEDIA_ROOT = os.path.join(BASE_DIR, "media") DATA_ROOT = os.path.join(BASE_DIR, "data") EXTRA_FILES_ROOT = os.path.join(BASE_DIR, "extra_files") +SOLUTIONS_ROOT_EXTERNAL = os.getenv("SOLUTIONS_ROOT_EXTERNAL", os.path.join(DATA_ROOT, "solutions")) for root in DATA_ROOT, EXTRA_FILES_ROOT, MEDIA_ROOT: if not os.path.exists(root): os.mkdir(root) diff --git a/config.py b/config.py index 58c1677..ecbffca 100644 --- a/config.py +++ b/config.py @@ -1,2 +1,2 @@ -SOLUTIONS_ROOT_EXTERNAL = "/sprint-data/data/solutions" + DEPLOY = False