Merge branch 'master' into 'release/1.2.0'

Update release with latest changes

See merge request kasm-technologies/internal/KasmVNC!109
This commit is contained in:
Matthew McClaskey 2023-08-21 17:52:45 +00:00
commit 446d03d479
3 changed files with 22 additions and 1 deletions

View File

@ -35,7 +35,7 @@ sub new {
},
toStringSub => $args->{toStringSub} || sub {
my $self = shift;
my $derivedValue = $self->deriveValue();
if (defined($derivedValue)) {
return "-$self->{name} " . "'$derivedValue'";

View File

@ -23,6 +23,9 @@ network:
pem_certificate: /etc/ssl/certs/ssl-cert-snakeoil.pem
pem_key: /etc/ssl/private/ssl-cert-snakeoil.key
require_ssl: true
# unix_relay:
# name:
# path:
user_session:
# session_type: shared

View File

@ -1402,6 +1402,24 @@ sub DefineConfigToCLIConversion {
})
]
}),
KasmVNC::CliOption->new({
name => 'UnixRelay',
configKeys => [
KasmVNC::ConfigKey->new({
name => "network.unix_relay.name",
type => KasmVNC::ConfigKey::ANY
}),
KasmVNC::ConfigKey->new({
name => "network.unix_relay.path",
type => KasmVNC::ConfigKey::ANY
})
],
deriveValueSub => sub {
my $self = shift;
$self->{"network.unix_relay.name"} . ":" . $self->{"network.unix_relay.path"};
},
}),
KasmVNC::CliOption->new({
name => 'AlwaysShared',
configKeys => [