aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-05-09 10:46:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-09 10:46:12 +0000
commit578334b7122d8c022756ba1e73c7d05c4b435d98 (patch)
treecec49a773a5931a323ff5ee45d988a9547a95707
parent6eabdeab92e93019c7d36573132c3f62a6d9a4f3 (diff)
parent3f9fc6aac50fd9d1f4c723cde1e0b8e68a4b8a13 (diff)
Merge changes I66bece21,I331c53d5,I5000ff2a
* changes: Make redirect ready in lighttpd Make onap-beijing as default product in use Enable web-console under OOM environment
-rw-r--r--deployment/docker/src/main/docker/Dockerfile2
-rw-r--r--deployment/http/lighttpd/10-proxy.conf14
-rw-r--r--deployment/http/web/index.html6
3 files changed, 12 insertions, 10 deletions
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
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
+ }
+}
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.