From 4842c5b4d25d8798d02a4bf6db769e333f09f791 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 21 Aug 2019 11:13:17 +0200
Subject: [PATCH] Provide upload command as http.
---
nomad/api/upload.py | 2 +-
nomad/config.py | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/nomad/api/upload.py b/nomad/api/upload.py
index 2e77466cd2..fb5df116e4 100644
--- a/nomad/api/upload.py
+++ b/nomad/api/upload.py
@@ -528,7 +528,7 @@ class UploadCommandResource(Resource):
@login_really_required
def get(self):
""" Get url and example command for shell based uploads. """
- upload_url = '%s/uploads/?curl=True' % config.api_url()
+ upload_url = '%s/uploads/?curl=True' % config.api_url(ssl=False)
upload_url_with_name = upload_url + '&name=<name>'
# upload_command = 'curl -X PUT -H "X-Token: %s" "%s" -F file=@<local_file>' % (
diff --git a/nomad/config.py b/nomad/config.py
index 3a6dc047dd..dcf8ce4903 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -156,11 +156,10 @@ tests = NomadConfig(
)
-def api_url():
- return '%s://%s%s%s' % (
- 'https' if services.https else 'http',
+def api_url(ssl: bool = True):
+ return '%s://%s%s' % (
+ 'https' if services.https and ssl else 'http',
services.api_host,
- ':%s' % services.api_port if int(services.api_port) != 80 else '',
services.api_base_path)
--
GitLab