kirsle/henry-web
1
0
Fork 0
mirror of https://git.henryfjordan.com/henry/web synced 2019-01-16 02:39:46 +00:00
Code Issues Releases Wiki Activity

ugh working again

Browse Source
This commit is contained in:
Henry Jordan 2018-09-05 02:20:17 -07:00
parent 10cbb7df41
commit 309414867d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -58,8 +58,6 @@ services:
gitea: gitea:
image: gitea/gitea:latest image: gitea/gitea:latest
restart: always restart: always
networks:
- gitea
volumes: volumes:
- gitea-data:/data - gitea-data:/data
expose: expose:
@ -89,7 +87,7 @@ services:
expose: expose:
- 8080 - 8080
ports: ports:
- "8080:8080" - "8080:80"
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- ./apache/apache2.conf:/etc/apache2/apache2.conf - ./apache/apache2.conf:/etc/apache2/apache2.conf

20
nginx/conf/nginx.conf
View File

@ -55,12 +55,16 @@ http {
index index.html; index index.html;
upstream gitea { # upstream gitea {
server gitea:3000; # server gitea:3000;
} # }
upstream portainer { # upstream portainer {
server portainer:9000; # server portainer:9000;
# }
upstream nextcloud {
server nextcloud:80;
} }
# Redirect to https # Redirect to https
@ -116,7 +120,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
location / { location / {
proxy_pass http://gitea; proxy_pass http://gitea:3000;
} }
location /.well-known { location /.well-known {
@ -144,7 +148,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
location / { location / {
proxy_pass http://172.20.0.4; proxy_pass http://nextcloud;
} }
location /.well-known { location /.well-known {
@ -172,7 +176,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
location / { location / {
proxy_pass http://portainer; proxy_pass http://portainer:9000;
} }
location /.well-known { location /.well-known {