diff --git a/gui/nginx.conf b/gui/nginx.conf index 2fdf8d23e280d3af2a571a665543daee15046155..3aaf2fc647dffb3c149327c78cb398f46a53092d 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 93abfa7edae8bb8b2178dc78c34d07bd6b35a42b..f72d1c115be0b14b04f673a481aac658c38a639c 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 6ff9f08fef1ae470319c850f0be95ed695bf392d..864f49ce0e492a9f770cabf0d4596555769b163c 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 +)