From 739101791fca4d14347d4841bc0681279e2e1ecc Mon Sep 17 00:00:00 2001 From: Zack Wong <coffee@ucc.asn.au> Date: Sun, 24 Feb 2019 15:34:26 +0800 Subject: [PATCH] fix ci config --- .gitlab-ci.yml | 3 ++- src/gms/settings_local.example.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5934f1b..c1ee290 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,11 +25,12 @@ deploy_test: script: - echo "Deploy to test" - rm -f /var/www/test/$CI_COMMIT_REF_NAME - - ln -srT ./ /var/www/test/$CI_COMMIT_REF_NAME + - rm -f /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini - mkdir .db - envsubst < src/gms/settings_local.example.py > src/gms/settings_local.py - python src/manage.py makemigrations - python src/manage.py migrate --run-syncdb + - ln -srT ./ /var/www/test/$CI_COMMIT_REF_NAME - ln -s /etc/uwsgi/vassals/test.skel /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini environment: name: test/$CI_COMMIT_REF_NAME diff --git a/src/gms/settings_local.example.py b/src/gms/settings_local.example.py index a072c28..dd91a37 100644 --- a/src/gms/settings_local.example.py +++ b/src/gms/settings_local.example.py @@ -36,7 +36,7 @@ DATABASES = { SECRET_KEY = '${APP_SECRET}' # Set this to whatever your ServerName/ServerAlias(es) are -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['${DEPLOY_HOST}'] LOG_LEVEL = 'DEBUG' LOG_FILENAME = os.path.join(ROOT_DIR, "django.log") -- GitLab