From 12c63e0ec0be16795402fab6e6af0922179f9029 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Sun, 15 Feb 2015 15:01:47 +0200 Subject: derive rz_config values from flask SERVER_NAME only, avoid mixing rz_config.listen_port --- src/server/rz_api.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/server') diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 88bed3e7..ef278d48 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -139,9 +139,15 @@ def index(): # for which the user would at least be known to the user_db log.exception(e) - hostname = current_app.rz_config.SERVER_NAME - port = current_app.rz_config.listen_port - if ':' in hostname: - hostname = hostname.split(':')[0] # split off port - - return render_template('index.html', rz_username=rz_username, hostname=hostname, port=port) + # establish rz_config template values + flask_server_name = current_app.rz_config.SERVER_NAME + hostname = flask_server_name + port = 80 + if ':' in flask_server_name: + hostname = flask_server_name.split(':')[0] + port = flask_server_name.split(':')[1] + + return render_template('index.html', + rz_username=rz_username, + rz_config__hostname=hostname, + rz_config__port=port) -- cgit v1.3.1