[Kimchi-devel] [PATCH] [Wok 1/6] Wok config: move websockets port setting to [server] section

[Aline Manera]

'display_proxy_port' represents the websockets proxy port. So rename it
to a  meaningful name ('websockets_port') and move to the [server] section.
There is no need to have a specific section to this kind of configuration.

Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
 src/wok.conf.in      | 7 +++----
 src/wok/config.py.in | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/wok.conf.in b/src/wok.conf.in
index 60d826f..7406671 100644
--- a/src/wok.conf.in
+++ b/src/wok.conf.in
@@ -15,6 +15,9 @@
 # Cherrypy server port
 #cherrypy_port = 8010
 
+# Port for websocket proxy to listen on
+#websockets_port = 64667
+
 # The full path to an SSL Certificate in PEM format.  If left unspecified,
 # Wok will generate a self-signed certificate automatically.
 #ssl_cert =
@@ -43,10 +46,6 @@
 # Logging level: debug, info, warning, error or critical
 #log_level = debug
 
-[display]
-# Port for websocket proxy to listen on
-#display_proxy_port = 64667
-
 [authentication]
 # Authentication method, available option: pam, ldap.
 # method = pam
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 0c83812..e84be5f 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -1,7 +1,7 @@
 #
 # Project Wok
 #
-# Copyright IBM, Corp. 2013-2015
+# Copyright IBM, Corp. 2013-2016
 #
 # Code derived from Project Kimchi
 #
@@ -232,6 +232,7 @@ def _get_config():
     config.set("server", "port", "8000")
     config.set("server", "ssl_port", "8001")
     config.set("server", "cherrypy_port", "8010")
+    config.set("server", "websockets_port", "64667")
     config.set("server", "ssl_cert", "")
     config.set("server", "ssl_key", "")
     config.set("server", "environment", "production")
@@ -247,8 +248,6 @@ def _get_config():
     config.add_section("logging")
     config.set("logging", "log_dir", paths.log_dir)
     config.set("logging", "log_level", DEFAULT_LOG_LEVEL)
-    config.add_section("display")
-    config.set("display", "display_proxy_port", "64667")
 
     config_file = os.path.join(paths.conf_dir, 'wok.conf')
     if os.path.exists(config_file):
-- 
2.5.0