From e0a406efe58cbb1381f3d052d0939e97c5bce413 Mon Sep 17 00:00:00 2001 From: Ndibe Raymond Olisaemeka Date: Thu, 7 Jan 2021 01:47:18 +0100 Subject: [PATCH] phase2 patial ----- 2 (#66) * added description to the video url field in project creation form issue #50 (#61) * new deployment changes (#62) * increased pagination limit from 6 to 20 (#63) * phase2 patial ----- 2 (#65) switched handling of ssl back to valian/docker-nginx-auto-ssl --- zubhub_frontend/zubhub/deploy_frontend.sh | 2 +- zubhub_frontend/zubhub/docker-compose.yml | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/zubhub_frontend/zubhub/deploy_frontend.sh b/zubhub_frontend/zubhub/deploy_frontend.sh index eb4288981..27f1c686d 100644 --- a/zubhub_frontend/zubhub/deploy_frontend.sh +++ b/zubhub_frontend/zubhub/deploy_frontend.sh @@ -1,7 +1,7 @@ #! /bin/bash mv zubhub_frontend/zubhub/.env zubhub/zubhub_frontend/zubhub/.env -mv zubhub_frontend/zubhub/.zero-ssl zubhub/zubhub_frontend/zubhub/ +mv zubhub_frontend/zubhub/.ssl-data zubhub/zubhub_frontend/zubhub/ rm -rf zubhub_frontend cp -r zubhub/zubhub_frontend/ zubhub_frontend/ rm -rf zubhub/ zubhub_frontend/zubhub/.env.example diff --git a/zubhub_frontend/zubhub/docker-compose.yml b/zubhub_frontend/zubhub/docker-compose.yml index 8d8b50f3d..5ece3d7fc 100644 --- a/zubhub_frontend/zubhub/docker-compose.yml +++ b/zubhub_frontend/zubhub/docker-compose.yml @@ -13,14 +13,20 @@ services: - "8080:80" reverse-proxy: - image: nginx:stable-alpine + image: valian/docker-nginx-auto-ssl:1.0.0 container_name: reverse-proxy restart: on-failure ports: - 80:80 - 443:443 volumes: - - ./.zero-ssl:/etc/ssl - - ./reverse-proxy:/etc/nginx + - ./.ssl-data:/etc/resty-auto-ssl + environment: + ALLOWED_DOMAINS: "(zubhub|www.zubhub).unstructured.studio" + SITES: "zubhub.unstructured.studio=zubhub_frontend;www.zubhub.unstructured.studio=zubhub_frontend" + FORCE_HTTPS: "true" depends_on: - zubhub_frontend + +volumes: + .ssl-data: