From 75bba28a7c739002c1a8412914e10f3506bea86d Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 9 Feb 2015 16:18:12 +0200
Subject: server/client: move rz_config to templates, fill in to match server
 config host/post

---
 src/client/app.js       |  1 +
 src/client/rz_config.js | 11 -----------
 src/server/rz_api.py    | 12 ++++++++++++
 src/server/rz_server.py |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 src/client/rz_config.js

(limited to 'src')

diff --git a/src/client/app.js b/src/client/app.js
index b0485090..dd2b034a 100644
--- a/src/client/app.js
+++ b/src/client/app.js
@@ -5,6 +5,7 @@
             'socketio': { exports: 'io' },
         },
         paths: {
+            rz_config: '/rz_config',
             autocomplete: lib_path + 'autocomplete',
             caret: lib_path + 'caret',
             Bacon: lib_path + 'Bacon',
diff --git a/src/client/rz_config.js b/src/client/rz_config.js
deleted file mode 100644
index df283f41..00000000
--- a/src/client/rz_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function() {
-
-    return {
-        'rand_id_generator' : 'hash',
-        'rz_server_host': 'rhizi.local',
-        'rz_server_port': '8080',
-        'backend_enabled': true,
-        'backend__maintain_ws_connection': true,
-        'feedback_url': '/feedback',
-    };
-});
diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index 64f7e3e0..da52b4a2 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -8,6 +8,7 @@ from flask import escape
 from flask import render_template
 from flask import request
 from flask import session
+from flask import Response
 import logging
 import traceback
 
@@ -133,3 +134,14 @@ def index():
         rz_username = escape(u_account.rz_username)
 
     return render_template('index.html', rz_username=rz_username)
+
+def rz_config():
+    server_name = current_app.rz_config.SERVER_NAME
+    if ':' in server_name:
+        hostname, port = server_name.split(':')
+    else:
+        hostname, port = server_name, 80
+    body = render_template('rz_config.js', hostname=hostname, port=port)
+    response = Response(body, status=200, mimetype='application/json')
+
+    return response
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index dc4de679..4622b488 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -205,6 +205,7 @@ def init_rest_interface(cfg, flask_webapp):
         return wrapped_function
 
     rest_entry_set = [
+                      rest_entry('/rz_config.js', rz_api.rz_config, {'methods': ['GET']}),
                       rest_entry('/feedback', rz_feedback.rest__send_user_feedback__email),
                       rest_entry('/graph/clone', rz_api.rz_clone),
                       rest_entry('/graph/diff-commit-set', rz_api.diff_commit__set),
-- 
cgit v1.3.1