Merge branch 'develop' into 'master'

api.sika.sik.party

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!13

.gitlab-ci.yml

@@ -1,12 +1,11 @@
 stages:
-    - test
-    - lint
+    - qa
     - publish
     - deploy
 
 test:
     image: python:3.7
-    stage: test
+    stage: qa
     services:
         - postgres:12
     variables:
@@ -24,14 +23,14 @@ test:
 
 pycodestyle:
     image: python:3.7
-    stage: lint
+    stage: qa
     script:
         - pip install pycodestyle
         - pycodestyle --config=setup.cfg --count .
 
 eslint:
     image: node:alpine
-    stage: lint
+    stage: qa
     before_script:
         - npm install
     script:
@@ -39,7 +38,7 @@ eslint:
 
 remark:
     image: node:alpine
-    stage: lint
+    stage: qa
     before_script:
         - npm install
     script:
@@ -59,7 +58,7 @@ publish:
         - docker build . -t "$IMAGE_NAME"
         - docker push "$IMAGE_NAME"
 
-deploy_dev:
+deploy:dev:
     stage: deploy
     image: alpine:latest
     environment:
@@ -82,14 +81,14 @@ deploy_dev:
         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME\""
 
-deploy_production:
+deploy:production:
     stage: deploy
     image: docker:stable
     only:
         - master
     environment:
         name: production
-        url: sika.sik.party
+        url: api.sika.sik.party
     when: manual
     variables:
         DOCKER_HOST: $CI_DOCKER_HOST

sikweb/settings.py

@@ -16,8 +16,8 @@ from sikweb.base import *
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv('DEBUG', False) == 'True'
 
-URL = os.getenv("HOST", "sika.sik.party")
-ALLOWED_HOSTS = ["localhost", "127.0.0.1", URL]
+URL = os.getenv("HOST", "api.sika.sik.party")
+ALLOWED_HOSTS = ["localhost", "127.0.0.1", "sika.sik.party", URL]
 if DEBUG:
     ALLOWED_HOSTS = ["*"]
 

stack-compose.yml

@@ -5,7 +5,7 @@ services:
     ports:
       - 5000:80
     environment:
-      - AUTH_BACKEND_URL=https://sika.sik.party/jwt_nginx
+      - AUTH_BACKEND_URL=https://api.sika.sik.party/jwt_nginx
       - AUTH_LOGIN_URL=https://sika.sik.party/admin/login
     volumes:
       - /home/sik/production/files/static:/srv