From 1453d17514297374b7a206483db75ec04be531ef Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 17 Oct 2019 19:25:10 +0100
Subject: [PATCH] remove mockup from reverse proxy
---
docker-compose.yml | 4 ++--
etc/nginx/default.conf | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 3acd0b7..d8a92aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
volumes:
- ./etc/nginx/:/etc/nginx/conf.d/
ports:
- - 8080:8080
+ - 80:80
depends_on:
- backend
- frontend
@@ -61,7 +61,7 @@ services:
- ./etc/villas/node:/etc/villas/node
- ./data:/data
ports:
- - "8081:80"
+ - "8080:80"
- "12000-12010:12000-12010/udp"
- "12000-12010:12000-12010/tcp"
restart: always
diff --git a/etc/nginx/default.conf b/etc/nginx/default.conf
index 72c413e..b3aa9d2 100644
--- a/etc/nginx/default.conf
+++ b/etc/nginx/default.conf
@@ -80,12 +80,3 @@ server {
proxy_pass http://mongo-express:8081/mongo-express/;
}
}
-
-server {
- listen 8080;
- server_name Mockup;
-
- location / {
- proxy_pass http://node/;
- }
-}
--
GitLab