1:05 p.m.
websockify/console.html was created to redirect the user, after he/she
accepts the browser certificate to 64667 port, to the console web page
(noVNC or Spice).
It is a Kimchi specific feature and there is no need to be on Wok.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
configure.ac | 3 +--
ui/pages/Makefile.am | 4 +---
ui/pages/websockify/Makefile.am | 22 ----------------------
ui/pages/websockify/console.html | 25 -------------------------
4 files changed, 2 insertions(+), 52 deletions(-)
delete mode 100644 ui/pages/websockify/Makefile.am
delete mode 100644 ui/pages/websockify/console.html
diff --git a/configure.ac b/configure.ac
index d753b67..915b2f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
#
# Project Wok
#
-# Copyright IBM Corp, 2013-2015
+# Copyright IBM Corp, 2013-2016
#
# Code derived from Project Kimchi
#
@@ -139,7 +139,6 @@ AC_CONFIG_FILES([
ui/libs/jquery-ui/themes/base/images/Makefile
ui/libs/list-js/Makefile
ui/pages/Makefile
- ui/pages/websockify/Makefile
contrib/Makefile
contrib/DEBIAN/Makefile
contrib/DEBIAN/control
diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am
index 2488203..53a6e76 100644
--- a/ui/pages/Makefile.am
+++ b/ui/pages/Makefile.am
@@ -1,7 +1,7 @@
#
# Project Wok
#
-# Copyright IBM, Corp. 2013-2015
+# Copyright IBM, Corp. 2013-2016
#
# Code derived from Project Kimchi
#
@@ -17,8 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = websockify
-
htmldir = $(datadir)/wok/ui/pages
dist_html_DATA = $(wildcard *.tmpl) $(NULL)
diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am
deleted file mode 100644
index ca3ddc3..0000000
--- a/ui/pages/websockify/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Project Wok
-#
-# Copyright IBM, Corp. 2014-2015
-#
-# Code derived from Project Kimchi
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-websockifyhtmldir = $(datadir)/wok/ui/pages/websockify
-
-dist_websockifyhtml_DATA = $(wildcard *.html) $(NULL)
diff --git a/ui/pages/websockify/console.html b/ui/pages/websockify/console.html
deleted file mode 100644
index e0a3cd4..0000000
--- a/ui/pages/websockify/console.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <script type="text/javascript">
- redirectToWok = function() {
- var query = window.location.search;
-
- var path = /.*url=(.*?)(&|$)/g.exec(query)[1];
- query = query.replace("url=" + path + "&", "")
- query = query.replace("url=" + path, "")
-
- var wok_port = /.*wok=(.*?)(&|$)/g.exec(query)[1];
- query = query.replace("wok=" + wok_port + "&",
"")
- query = query.replace("wok=" + wok_port, "")
-
- var url = "https://" + location.hostname + ":" + wok_port +
"/";
- url += decodeURIComponent(path) + query
-
- window.location.replace(url)
- }
- </script>
- </head>
-
- <body onload="redirectToWok()"/>
-</html>
--
2.5.0