Set HTTPS port to 443 & 9090

Issue-ID: CLI-255

Change-Id: I9ea233598f0502907fec3d2fea4b600c5f87b35e
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index fbeee83..6d5a8bc 100644 (file)
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -27,8 +27,7 @@ ENV OPEN_CLI_HOME=/opt/oclip \
     OPEN_CLI_DEBUG_PORT=5005 \
     OPEN_CLI_MODE=shell \
     OPEN_CLI_PRODUCT_IN_USE=onap-dublin \
-    GOTTY_TITLE_FORMAT="{{ .command }}" \
-    OCLIP_GRPC_SERVER="http://oclip_ocs_grpc:50051"
+    GOTTY_TITLE_FORMAT="{{ .command }}"
 
 ADD ./STAGE $OPEN_CLI_HOME
 WORKDIR $OPEN_CLI_HOME
@@ -60,11 +59,11 @@ RUN sudo apt-get install -y lighttpd git curl pandoc vim && \
     cp $OPEN_CLI_HOME/http/web/ocomp.key ~/.gotty.key && \
     sudo cp $OPEN_CLI_HOME/http/web/ocomp.pem /etc/lighttpd/ocomp.pem
     #openssl req -x509 -nodes -days 9999 -newkey rsa:2048 -keyout ~/.ocomp.key -out ~/.ocomp.crt -subj "/C=IN/ST=KA/L=BLR/O=CLI/CN=onap"
-EXPOSE 80
-EXPOSE 8080
+EXPOSE 443
+EXPOSE 9090
 EXPOSE 50051
-ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then sudo service lighttpd start; gotty -t --permit-write --reconnect oclip; \
+ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then sudo service lighttpd start; gotty -t --port 9090 --permit-write --reconnect oclip; \
            elif [ "$OPEN_CLI_MODE" = "ocs-web" ]; then echo "****** OCLIP Web Command Server ******"; sudo service lighttpd start; \
            elif [ "$OPEN_CLI_MODE" = "ocs-grpc" ]; then echo "****** OCLIP gRPC Command Server ******"; oclip-grpc; \
-           elif [ "$OPEN_CLI_MODE" = "occ" ]; then echo "****** OCLIP Web Command Console (OCC) ******"; gotty -t --permit-write --reconnect oclip; \
+           elif [ "$OPEN_CLI_MODE" = "occ" ]; then echo "****** OCLIP Web Command Console (OCC) ******"; gotty -t  --port 9090 --permit-write --reconnect oclip; \
            else echo "****** OCLIP Command Shell******"; oclip -v && /bin/bash; fi

diff --git a/deployment/http/lighttpd/lighttpd.conf b/deployment/http/lighttpd/lighttpd.conf
index 32baf8a..d7555a0 100644 (file)
--- a/deployment/http/lighttpd/lighttpd.conf
+++ b/deployment/http/lighttpd/lighttpd.conf
@@ -15,7 +15,7 @@
 server.document-root = "/var/www-data/servers/open-cli/"
 server.username             = "www-data"
 server.groupname            = "www-data"
-server.port                 = 80
+server.port                 = 443
 ssl.engine                  = "enable"
 ssl.pemfile                 = "/etc/lighttpd/ocomp.pem"