GUACAMOLE-527: Merge parameter definitions for SSH/SFTP host key.

This commit is contained in:
Michael Jumper
2018-06-27 21:03:15 -07:00
4 changed files with 25 additions and 10 deletions

View File

@@ -333,6 +333,10 @@
"name" : "sftp-port", "name" : "sftp-port",
"type" : "NUMERIC" "type" : "NUMERIC"
}, },
{
"name" : "sftp-host-key",
"type" : "TEXT"
},
{ {
"name" : "sftp-username", "name" : "sftp-username",
"type" : "USERNAME" "type" : "USERNAME"

View File

@@ -12,6 +12,10 @@
{ {
"name" : "port", "name" : "port",
"type" : "NUMERIC" "type" : "NUMERIC"
},
{
"name" : "host-key",
"type" : "TEXT"
} }
] ]
}, },

View File

@@ -127,6 +127,10 @@
"name" : "sftp-port", "name" : "sftp-port",
"type" : "NUMERIC" "type" : "NUMERIC"
}, },
{
"name" : "sftp-host-key",
"type" : "TEXT"
},
{ {
"name" : "sftp-username", "name" : "sftp-username",
"type" : "USERNAME" "type" : "USERNAME"

View File

@@ -364,6 +364,7 @@
"FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SECURITY" : "Security mode:",
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",
@@ -430,16 +431,17 @@
"FIELD_HEADER_COMMAND" : "Execute command:", "FIELD_HEADER_COMMAND" : "Execute command:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:", "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:", "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
"FIELD_HEADER_FONT_NAME" : "Font name:", "FIELD_HEADER_FONT_NAME" : "Font name:",
"FIELD_HEADER_FONT_SIZE" : "Font size:", "FIELD_HEADER_FONT_SIZE" : "Font size:",
"FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
"FIELD_HEADER_HOSTNAME" : "Hostname:", "FIELD_HEADER_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_HOSTNAME" : "Hostname:",
"FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_USERNAME" : "Username:",
"FIELD_HEADER_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_PASSWORD" : "Password:",
"FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_PASSPHRASE" : "Passphrase:",
"FIELD_HEADER_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_PORT" : "Port:",
"FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_READ_ONLY" : "Read-only:",
"FIELD_HEADER_RECORDING_EXCLUDE_MOUSE" : "Exclude mouse:", "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE" : "Exclude mouse:",
"FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "Exclude graphics/streams:", "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "Exclude graphics/streams:",
"FIELD_HEADER_RECORDING_INCLUDE_KEYS" : "Include key events:", "FIELD_HEADER_RECORDING_INCLUDE_KEYS" : "Include key events:",
@@ -587,6 +589,7 @@
"FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
"FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",