From 0e2481b7d430fd38588a22ba8e4515691ca403ad Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Wed, 9 May 2018 06:06:19 +0000
Subject: Enable web-console under OOM environment

Issue-ID: CLI-100

Change-Id: I5000ff2ad6b8706b88fb94660ee7944cc0625ee3
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/http/web/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'deployment')

diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
index c70e7018..04c356db 100644
--- a/deployment/http/web/index.html
+++ b/deployment/http/web/index.html
@@ -24,6 +24,10 @@ function redirectToConsole(){
    window.location.href="http://"+  window.location.hostname + ":9090";
 }
 
+function redirectToConsoleOOM(){
+   window.location.href="http://"+  window.location.hostname + ":30261";
+}
+
 </script>
 <style>
 
@@ -66,7 +70,7 @@ body {
 
 <h3 >Web Command Console (WCC)</h3>
 <p>Helps operator to access the command console over HTTP.
-<a onclick="redirectToConsole();" style="color: blue;cursor: pointer">Click here !</a>
+Click <a onclick="redirectToConsole();" style="color: blue;cursor: pointer">here !</a> OR <a onclick="redirectToConsoleOOM();" style="color: blue;cursor: pointer"> here !</a>
 
 <h3>Linux Shell</h3>
 <p>Helps operator to run CLI locally using Linux command shell.
-- 
cgit 1.2.3-korg


From 2d12bf3424ea17da5af94ac9e33cac231ca764ed Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Wed, 9 May 2018 06:15:54 +0000
Subject: Make onap-beijing as default product in use

Issue-ID: CLI-100

Change-Id: I331c53d546922513741f8b1a0db93593bb6cc514
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/docker/src/main/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'deployment')

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index f4556583..0c08bc54 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV OPEN_CLI_HOME=/opt/oclip \
     OPEN_CLI_DEBUG=false \
     OPEN_CLI_DEBUG_PORT=5005 \
     OPEN_CLI_MODE=console \
-    OPEN_CLI_PRODUCT_IN_USE=open-cli \
+    OPEN_CLI_PRODUCT_IN_USE=onap-beijing \
     GOTTY_TITLE_FORMAT="{{ .command }}"
 
 ADD ./STAGE $OPEN_CLI_HOME
-- 
cgit 1.2.3-korg


From 3f9fc6aac50fd9d1f4c723cde1e0b8e68a4b8a13 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Wed, 9 May 2018 06:18:07 +0000
Subject: Make redirect ready in lighttpd

Issue-ID: CLI-100

Change-Id: I66bece217432dedc82556fb18713a25d7220c8b3
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/http/lighttpd/10-proxy.conf | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'deployment')

diff --git a/deployment/http/lighttpd/10-proxy.conf b/deployment/http/lighttpd/10-proxy.conf
index f6ce4946..a2da19c3 100644
--- a/deployment/http/lighttpd/10-proxy.conf
+++ b/deployment/http/lighttpd/10-proxy.conf
@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-proxy.server     = ( "/onap" =>
-                     (
-                       ( "host" => "127.0.0.1",
-                         "port" => 8080
-                       )
-                     )
-                    )
-
+$HTTP["url"] =~ "^/web-console" {
+  $HTTP["host"] =~ ".*" {
+    url.redirect = ( "^/(.*)" => "http://%0:8080" )
+    url.redirect-code = 302
+  }
+}
-- 
cgit 1.2.3-korg