Skip to content

Commit a41ba21

Browse files
author
Digital-Larry
authored
CTD-287 added https option to interactive installer. Tested with nginx (#15)
running on Pi, set for https.
1 parent d5947a2 commit a41ba21

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

connectd/usr/bin/connectd_library

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# Copyright 2019. All rights reserved.
1111

1212
##### Settings #####
13-
LIBVERSION=lib_v2.1.12
13+
LIBVERSION=lib_v2.1.13
1414
AUTHOR="Gary Worsham"
15-
LIBMODIFIED="March 04, 2019"
15+
LIBMODIFIED="March 07, 2019"
1616
GREPFLAGS=
1717
apikey="remote.it.developertoolsHW9iHnd"
1818

@@ -275,6 +275,8 @@ checkforServices()
275275
elif [ "$protocol" = "Basic Web" ]; then
276276
protocol="WebPxy"
277277
port=80
278+
elif [ "$protocol" = "HTTPS" ]; then
279+
port=443
278280
elif [ "$protocol" = "HTTP" ]; then
279281
port=80
280282
elif [ "$protocol" = "VNC" ]; then
@@ -540,15 +542,16 @@ protocolSelection()
540542
printf " \n"
541543
printf " 1) SSH on port 22 \n"
542544
printf " 2) Web (HTTP) on port 80 \n"
543-
printf " 3) VNC on port 5900 \n"
544-
printf " 4) nxWitness on port 7001 \n"
545-
printf " 5) Custom (TCP) \n"
546-
printf " 6) Return to previous menu \n"
545+
printf " 3) Secure Web (HTTPS) on port 443 \n"
546+
printf " 4) VNC on port 5900 \n"
547+
printf " 5) nxWitness on port 7001 \n"
548+
printf " 6) Custom (TCP) \n"
549+
printf " 7) Return to previous menu \n"
547550
printf " \n"
548551
printf "***********************************************\n\n"
549552
printf " You can change the port value during install \n\n"
550553
printf "***********************************************\n\n"
551-
MAXSEL=6
554+
MAXSEL=7
552555
unset get_port
553556

554557
getNumRange 1 "$MAXSEL" "Choose a menu selection"
@@ -576,6 +579,16 @@ protocolSelection()
576579
fi
577580
setConnectdPort "$PROTOCOL"
578581
elif [ $get_num -eq 3 ]; then
582+
PROTOCOL=webs
583+
printf "The default port for Secure Web (https) is 443.\n"
584+
if ask "Would you like to continue with the default port assignment?"; then
585+
PORT=443
586+
else
587+
getNumRange 1 65535 "Enter the port value to use"
588+
PORT="$getNumRangeValue"
589+
fi
590+
setConnectdPort "$PROTOCOL"
591+
elif [ $get_num -eq 4 ]; then
579592
PROTOCOL=vnc
580593
printf "The default port for RealVNC is 5900.\n"
581594
printf "The default port for tightVNC is 5901.\n"
@@ -586,7 +599,7 @@ protocolSelection()
586599
PORT="$getNumRangeValue"
587600
fi
588601
setConnectdPort "$PROTOCOL"
589-
elif [ $get_num -eq 4 ]; then
602+
elif [ $get_num -eq 5 ]; then
590603
PROTOCOL=nxw
591604
printf "The default port for nxWitness is 7001.\n"
592605
if ask "Would you like to continue with port 7001?"; then
@@ -596,7 +609,7 @@ protocolSelection()
596609
PORT="$getNumRangeValue"
597610
fi
598611
setConnectdPort "$PROTOCOL"
599-
elif [ $get_num -eq 5 ]; then
612+
elif [ $get_num -eq 6 ]; then
600613
PROTOCOL=tcp
601614
getNumRange 1 65535 "Enter the port value to use"
602615
PORT="$getNumRangeValue"
@@ -1249,6 +1262,8 @@ installProvisioning()
12491262
contentType="28"
12501263
elif [ "$PROTOCOL" = "rmt3" ]; then
12511264
contentType="35"
1265+
elif [ "$PROTOCOL" = "webs" ]; then
1266+
contentType="33"
12521267
elif [ "$PROTOCOL" = "web" ]; then
12531268
contentType="7"
12541269
elif [ "$PROTOCOL" = "vnc" ]; then

0 commit comments

Comments
 (0)