From ec22528362c0caf5d594f276a50a20e44af4e86a Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Tue, 26 Jun 2018 07:57:33 +0000
Subject: [PATCH] last changes before RESERVE mid-term review
---
docker-compose.yml | 4 ++--
etc/nginx/villas.conf | 6 +++---
frontend | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 5709006..25b60e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,9 +23,9 @@ services:
NODE_ENV: dotenv
DATABASE_URL: mongodb://database:27017/
AMQP_ENDPOINT: "amqp://villas:s3c0sim4!@broker/%2F"
- LOG_LEVEL: verbose
+ LOG_LEVEL: info
LOG_FILE: villasweb-backend_log.txt
- DEFAULT_ADMIN: 1
+ DEFAULT_ADMIN: "true"
volumes:
- files:/usr/src/app/public/
depends_on:
diff --git a/etc/nginx/villas.conf b/etc/nginx/villas.conf
index 9b010fb..878ddb1 100644
--- a/etc/nginx/villas.conf
+++ b/etc/nginx/villas.conf
@@ -67,11 +67,11 @@ server {
# frontend location
location / {
- proxy_pass http://frontend:3000/;
+ proxy_pass http://frontend:5000/;
}
- location /mongo-express/ {
- proxy_pass http://mongo-express:8081/;
+ location /mongo-express {
+ proxy_pass http://mongo-express:8081/mongo-express/;
}
}
diff --git a/frontend b/frontend
index 8d87a6a..04d5ab5 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 8d87a6a828cc687de409a6b2422fe670bdc0721c
+Subproject commit 04d5ab54d68acb41bc55a40d8f1a7d533318c0aa
--
GitLab