From 40f7e8b5fc635a9e8a4eaf98e1854a5bea524c0d Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Mon, 27 Aug 2018 15:14:29 +0200
Subject: [PATCH] Bugfixes
---
gui/nginx.conf | 2 +-
infrastructure/nomadxt/docker-compose.yml | 1 +
nomad/config.py | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gui/nginx.conf b/gui/nginx.conf
index 2fdf8d23e2..3aaf2fc647 100644
--- a/gui/nginx.conf
+++ b/gui/nginx.conf
@@ -1,7 +1,7 @@
server {
listen 80;
- location / {
+ location /nomadxt/api {
proxy_pass http://api:8000;
}
diff --git a/infrastructure/nomadxt/docker-compose.yml b/infrastructure/nomadxt/docker-compose.yml
index 93abfa7eda..f72d1c115b 100644
--- a/infrastructure/nomadxt/docker-compose.yml
+++ b/infrastructure/nomadxt/docker-compose.yml
@@ -139,6 +139,7 @@ services:
- NOMAD_LOGSTASH_HOST=elk
- NOMAD_ELASTIC_HOST=elastic
- NOMAD_MONGO_HOST=mongo
+ - NOMAD_API_BASE_PATH=/nomadxt/api
links:
- minio
- redis
diff --git a/nomad/config.py b/nomad/config.py
index 6ff9f08fef..864f49ce0e 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -42,7 +42,7 @@ MongoConfig = namedtuple('MongoConfig', ['host', 'users_db'])
LogstashConfig = namedtuple('LogstashConfig', ['enabled', 'host', 'tcp_port'])
""" Used to configure and enable/disable the ELK based centralized logging. """
-NomadServicesConfig = namedtupe('NomadServicesConfig', ['api_base_path'])
+NomadServicesConfig = namedtuple('NomadServicesConfig', ['api_base_path'])
""" Used to configure nomad services: worker, handler, api """
files = FilesConfig(
@@ -91,4 +91,4 @@ logstash = LogstashConfig(
)
services = NomadServicesConfig(
api_base_path='/nomadxt/api'
-)
\ No newline at end of file
+)
--
GitLab