diff --git a/nomad/api/upload.py b/nomad/api/upload.py index 2e77466cd28655f29219e16b13d2f341f71d5080..fb5df116e4d03e3a7f01cb5b9f044879a8e37d6f 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 3a6dc047ddc780a10fe64ea77e7476dfcdb9218d..dcf8ce4903a7746e5371c1bd2b7e2b121756d3af 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)