diff --git a/docker-compose.yml b/docker-compose.yml index b6f86fb..6b9feb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/nginx/conf/nginx.conf b/nginx/conf/nginx.conf index 518da72..d34b3d4 100644 --- a/nginx/conf/nginx.conf +++ b/nginx/conf/nginx.conf @@ -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 {