Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch back to using valian/nginx-auto-ssl for handling site ssl #65

Merged
merged 13 commits into from
Jan 7, 2021
Merged

switch back to using valian/nginx-auto-ssl for handling site ssl #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e93e6e2
domain setup step 1 test 5
NdibeRaymond Dec 21, 2020
0f7d2b1
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 21, 2020
8f28f17
domain setup step 2(backend) test 1
NdibeRaymond Dec 21, 2020
101769f
domain setup step2(backend) test2
NdibeRaymond Dec 21, 2020
1088881
Merge branch 'master' into deployment
NdibeRaymond Dec 21, 2020
f372da9
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 23, 2020
f7b373a
removed .ssl-data from .dockerignore
NdibeRaymond Dec 23, 2020
623edf8
Merge branch 'deployment' of https://github.com/unstructuredstudio/zu…
NdibeRaymond Dec 23, 2020
20b3d05
added custom nginx container to handle reverse proxying and https req…
NdibeRaymond Dec 27, 2020
7d44de8
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Jan 6, 2021
680528d
made important changes to deploy_frontend.sh, added google tracking c…
NdibeRaymond Jan 6, 2021
7653ccb
switched handling of ssl back to valian/docker-nginx-auto-ssl
NdibeRaymond Jan 7, 2021
a9f9b05
Merge branch 'phase2' into deployment
NdibeRaymond Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zubhub_frontend/zubhub/deploy_frontend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 9 additions & 3 deletions zubhub_frontend/zubhub/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: