diff --git a/backend b/backend index 3c6b6ba..123eb65 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 3c6b6ba0995af1499b272010c9822cc0c2501c5a +Subproject commit 123eb65f8ee0cf0a5eb188daa9ae756ffca8e325 diff --git a/run.py b/run.py deleted file mode 100755 index 3f94c2f..0000000 --- a/run.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# -*- coding: utf-8 -*- -import ssl -import logging -from backend import app - -logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') - -print(app.config.get("SERVER_NAME", None)) -server_name = app.config.get("SERVER_NAME", None) -if server_name is not None and "ubkaps154.ubka.uni-karlsruhe.de" in server_name: - try: - context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) - context.load_cert_chain('cert.pem', 'key.pem') - app.run(debug=True, ssl_context=context, threaded=True) - except FileNotFoundError: - app.run(debug=True, threaded=True) - -app.run(debug=True) diff --git a/run.sh b/run.sh index 578be58..77ff5b1 100755 --- a/run.sh +++ b/run.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash cd "${0%/*}" -$(PIPENV_PIPFILE=./backend/Pipfile pipenv --venv)/bin/python run.py +$(PIPENV_PIPFILE=./backend/Pipfile pipenv --venv)/bin/python -m backend +