From c13bc9b6cc342b36e2cd444885d723a39104e9f3 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Mon, 27 Aug 2018 22:32:51 +0200
Subject: [PATCH] Working infra.
---
gui/nginx.conf | 11 ++++++++---
infrastructure/.gitignore | 2 --
infrastructure/nomadxt/docker-compose.yml | 15 ++++++++++++++-
infrastructure/up-wo-elk.sh | 2 --
nomad/api.py | 8 ++++++--
nomad/config.py | 2 +-
6 files changed, 29 insertions(+), 11 deletions(-)
delete mode 100644 infrastructure/.gitignore
delete mode 100644 infrastructure/up-wo-elk.sh
diff --git a/gui/nginx.conf b/gui/nginx.conf
index 5db1f4d4fb..ad80ab5adc 100644
--- a/gui/nginx.conf
+++ b/gui/nginx.conf
@@ -1,16 +1,21 @@
server {
listen 80;
+ server_name www.example.com;
location /nomadxt {
- root /app/;
+ root /app/;
}
location /nomadxt/api {
+ proxy_set_header Host $http_host;
proxy_pass http://api:8000;
}
location ~ ^/nomadxt/objects/(.*)$ {
- resolver 127.0.0.11 ipv6=off; # docker embedded DNS
- proxy_pass http://minio:9000/$1;
+ client_max_body_size 20g;
+ resolver 127.0.0.11 ipv6=off; # docker embedded DNS
+ proxy_set_header Host $http_host;
+ proxy_pass http://minio:9000/$1;
}
+
}
diff --git a/infrastructure/.gitignore b/infrastructure/.gitignore
deleted file mode 100644
index 58e90b33ff..0000000000
--- a/infrastructure/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-data/
-config/
diff --git a/infrastructure/nomadxt/docker-compose.yml b/infrastructure/nomadxt/docker-compose.yml
index 2df0fdf71b..e1665d5968 100644
--- a/infrastructure/nomadxt/docker-compose.yml
+++ b/infrastructure/nomadxt/docker-compose.yml
@@ -25,12 +25,25 @@ services:
- ${MINIO_HOST_PORT}:9000
volumes:
- ${VOLUME_BINDS}/minio:/data
- - ../config/minio:/root/.minio
environment:
- MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
- MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
command: server /data
+ minio-config:
+ image: minio/mc
+ links:
+ - minio
+ entrypoint: /bin/sh -c "
+ sleep 5;
+ /usr/bin/mc config host add minio http://minio:9000 AKIAIOSFODNN7EXAMPLE wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY;
+ /usr/bin/mc mb minio/uploads -p;
+ /usr/bin/mc mb minio/archive -p;
+ /usr/bin/mc mb minio/repository -p;
+ /usr/bin/mc policy download minio/repository;
+ /usr/bin/mc policy download minio/archive;
+ /usr/bin/mc policy upload minio/uploads;"
+
# broker for celery
rabbitmq:
restart: always
diff --git a/infrastructure/up-wo-elk.sh b/infrastructure/up-wo-elk.sh
deleted file mode 100644
index 113e613a36..0000000000
--- a/infrastructure/up-wo-elk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker-compose up minio rabbitmq redis
\ No newline at end of file
diff --git a/nomad/api.py b/nomad/api.py
index bcfaf15218..4c24ad0e98 100644
--- a/nomad/api.py
+++ b/nomad/api.py
@@ -30,10 +30,13 @@ if me is None:
def _external_objects_url(url):
""" Replaces the given internal object storage url (minio) with an URL that allows
external access. """
- port_with_color = '' if config.services.objects_port > 0 else ':%d' % config.services.objects_port
+ port_with_colon = ''
+ if config.services.objects_port > 0:
+ port_with_colon = ':%d' % config.services.objects_port
+
return url.replace(
'%s:%s' % (config.minio.host, config.minio.port),
- '%s:%s%s' % (config.services.objects_host, port_with_color, config.services.objects_base_path))
+ '%s%s%s' % (config.services.objects_host, port_with_colon, config.services.objects_base_path))
class Uploads(Resource):
@@ -50,6 +53,7 @@ class Uploads(Resource):
'name': upload.name,
'upload_id': upload.upload_id,
'presigned_url': _external_objects_url(upload.presigned_url),
+ 'presigned_orig': upload.presigned_url,
'create_time': upload.create_time.isoformat() if upload.create_time is not None else None,
'upload_time': upload.upload_time.isoformat() if upload.upload_time is not None else None,
'proc_time': upload.proc_time.isoformat() if upload.proc_time is not None else None,
diff --git a/nomad/config.py b/nomad/config.py
index 034280531d..fd5206b5cd 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -92,6 +92,6 @@ logstash = LogstashConfig(
services = NomadServicesConfig(
api_base_path=os.environ.get('NOMAD_API_BASE_PATH', ''),
objects_host=os.environ.get('NOMAD_OBJECTS_HOST', 'localhost'),
- objects_port=int(os.environ.get('NOMAD_OBJECTS_PORT', -1)),
+ objects_port=int(os.environ.get('NOMAD_OBJECTS_PORT', minio.port)),
objects_base_path=os.environ.get('NOMAD_OBJECTS_BASE_PATH', '')
)
--
GitLab