Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Ylianst committed Dec 9, 2022
2 parents 3acccaf + 9d18fb6 commit 1087d7e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
11 changes: 11 additions & 0 deletions docs/Example configs/haproxy-with-sni-sample.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ backend sni-back
use-server gitlabSNI if gitlab-sni
use-server mc-SNI if mc-sni
server mc-SNI 10.1.1.10:1443 send-proxy-v2-ssl-cn

frontend cira-tcp-front
bind 10.1.1.10:4433
mode tcp
option tcplog
tcp-request inspect-delay 5s
default_backend mc-cira-back

backend cira-tcp-back
mode tcp
server mc-cira 10.1.1.30:4433

frontend mc-front-HTTPS
mode http
Expand Down
8 changes: 7 additions & 1 deletion views/sharing-mobile.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,13 @@
return obj;
}
function tunnelUpdate(data) { if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); } }
function tunnelUpdate(data) {
if (xterm.writeUtf8) {
if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); }
} else {
if (typeof data == 'string') { xterm.write(data); } else { xterm.write(new Uint8Array(data)); }
}
}
function sshTunnelUpdate(data) {
if (typeof data == 'string') {
Expand Down
12 changes: 9 additions & 3 deletions views/sharing.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
}
function deskAdjust() {
if ((xxcurrentView == 12) && (terminal != null) && (xtermfit != null)) { xtermfit.fit(); } // Terminal
if ((xxcurrentView == 12) && (terminal != null) && (xtermfit != null)) { xtermfit.fit(); } // Terminal
QS('fileArea4')['height'] = 'calc(100vh - ' + (90 + Q('fileArea2').clientHeight) + 'px)'; // Files
var parentH = Q('DeskParent').clientHeight, parentW = Q('DeskParent').clientWidth;
var deskH = Q('Desk').height, deskW = Q('Desk').width;
Expand Down Expand Up @@ -1405,7 +1405,13 @@
return obj;
}
function tunnelUpdate(data) { if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); } }
function tunnelUpdate(data) {
if (xterm.writeUtf8) {
if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); }
} else {
if (typeof data == 'string') { xterm.write(data); } else { xterm.write(new Uint8Array(data)); }
}
}
// Send the new terminal size to the agent
function xTermSendResize() {
Expand Down Expand Up @@ -1567,7 +1573,7 @@
//
// Files
//
//
function setupFiles() {
// Setup the files tab
Expand Down

0 comments on commit 1087d7e

Please sign in to comment.