ugh working again

master
Henry Jordan 2018-09-05 02:20:17 -07:00
parent 10cbb7df41
commit 309414867d
2 changed files with 13 additions and 11 deletions

View File

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

View File

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