Skip to content

Commit

Permalink
Merge branch 'master' into 'release/1.2.0'
Browse files Browse the repository at this point in the history
Update release with latest changes

See merge request kasm-technologies/internal/KasmVNC!109
  • Loading branch information
mattmcclaskey committed Aug 21, 2023
2 parents dda2917 + 04f95d2 commit 446d03d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion unix/KasmVNC/CliOption.pm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sub new {
},
toStringSub => $args->{toStringSub} || sub {
my $self = shift;

my $derivedValue = $self->deriveValue();
if (defined($derivedValue)) {
return "-$self->{name} " . "'$derivedValue'";
Expand Down
3 changes: 3 additions & 0 deletions unix/kasmvnc_defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions unix/vncserver
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [
Expand Down

0 comments on commit 446d03d

Please sign in to comment.