Skip to content

Commit 4a39339

Browse files
ashish1099ashish1099
committed
Merge pull request 'fix: handle rustdesk version parameter correctly' (#1350) from fix/handle-rustdesk-version into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1350
2 parents ec9d0cf + f70d6b2 commit 4a39339

File tree

8 files changed

+64
-54
lines changed

8 files changed

+64
-54
lines changed

‎Puppetfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,4 +476,4 @@ mod 'jcpunk/vnc',
476476

477477
mod 'obmondo/rustdesk',
478478
:git => 'https://github.com/Obmondo/puppet-rustdesk',
479-
:ref => 'v1.0.0'
479+
:ref => 'v1.0.1'

‎modules/enableit/common/manifests/software/rustdesk.pp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
#
55
# @param client_enable Boolean parameter to enable or disable the Rustdesk client. Defaults to false.
66
#
7-
# @param client_version SemVer parameter to control Rustdesk client version. Defaults to false.
7+
# @param client_version SemVer parameter to control Rustdesk client version. Defaults to 1.4.3.
88
#
99
# @param client_extra_dependencies Array[String] parameter to install OS specific dependencies. Defaults to [].
1010
#
1111
# @param server_enable Boolean parameter to enable or disable the Rustdesk server. Defaults to false.
1212
#
13-
# @param server_version SemVer parameter to control Rustdesk server version. Defaults to false.
13+
# @param server_version SemVer parameter to control Rustdesk server version. Default to 1.7.1.
1414
#
1515
# @param server_extra_dependencies Array[String] parameter to install OS specific dependencies. Defaults to [].
1616
#
1717
class common::software::rustdesk (
18-
Boolean $manage = false,
18+
Boolean $manage = false,
1919

20-
Boolean $client_enable = false,
21-
SemVer $client_version = false,
22-
Array[String] $client_extra_dependencies = [],
20+
Boolean $client_enable = false,
21+
Array[String] $client_extra_dependencies = [],
22+
Eit_types::Version $client_version = '1.4.3',
2323

24-
Boolean $server_enable = false,
25-
SemVer $server_version = false,
26-
Array[String] $server_extra_dependencies = [],
24+
Boolean $server_enable = false,
25+
Array[String] $server_extra_dependencies = [],
26+
Eit_types::Version $server_version = '1.7.1',
2727
) {
2828
if $manage {
2929
include profile::software::rustdesk

‎modules/enableit/profile/manifests/software/rustdesk.pp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
#
33
# @param client_enable Boolean parameter to enable or disable the Rustdesk client. Defaults to false.
44
#
5-
# @param client_version SemVer parameter to control Rustdesk client version. Defaults to false.
5+
# @param client_version SemVer parameter to control Rustdesk client version. Defaults to 1.4.3.
66
#
77
# @param client_extra_dependencies Array[String] parameter to install OS specific dependencies. Defaults to [].
88
#
99
# @param server_enable Boolean parameter to enable or disable the Rustdesk server. Defaults to false.
1010
#
11-
# @param server_version SemVer parameter to control Rustdesk server version. Defaults to false.
11+
# @param server_version SemVer parameter to control Rustdesk server version. Defaults to 1.7.1.
1212
#
1313
# @param server_extra_dependencies Array[String] parameter to install OS specific dependencies. Defaults to [].
1414
#
1515
class profile::software::rustdesk (
16-
Boolean $client_enable = $common::software::rustdesk::client_enable,
17-
SemVer $client_version = $common::software::rustdesk::client_version,
18-
Array[String] $client_extra_dependencies = $common::software::rustdesk::client_extra_dependencies,
16+
Boolean $client_enable = $common::software::rustdesk::client_enable,
17+
Eit_types::Version $client_version = $common::software::rustdesk::client_version,
18+
Array[String] $client_extra_dependencies = $common::software::rustdesk::client_extra_dependencies,
1919

20-
Boolean $server_enable = $common::software::rustdesk::server_enable,
21-
SemVer $server_version = $common::software::rustdesk::server_version,
22-
Array[String] $server_extra_dependencies = $common::software::rustdesk::server_extra_dependencies,
20+
Boolean $server_enable = $common::software::rustdesk::server_enable,
21+
Eit_types::Version $server_version = $common::software::rustdesk::server_version,
22+
Array[String] $server_extra_dependencies = $common::software::rustdesk::server_extra_dependencies,
2323
) {
2424
class { 'rustdesk':
2525
client_enable => $client_enable,
26-
client_version => $client_version,
26+
client_version => SemVer($client_version),
2727
client_extra_dependencies => $client_extra_dependencies,
2828

2929
server_enable => $server_enable,
30-
server_version => $server_version,
30+
server_version => SemVer($server_version),
3131
server_extra_dependencies => $server_extra_dependencies,
3232
}
3333
}

‎modules/upstream/rustdesk/data/common.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
rustdesk::server_enable: false
33
rustdesk::server_version: 1.7.1
44
rustdesk::server_dependencies: []
5-
rustdesk::server::signal::package_name: rustdesk-server-hbbs
6-
rustdesk::server::relay::package_name: rustdesk-server-hbbr
5+
rustdesk::server::package_names:
6+
signal: rustdesk-server-hbbs
7+
relay: rustdesk-server-hbbr
78

89
rustdesk::client_enable: false
910
rustdesk::client_version: 1.4.3

‎modules/upstream/rustdesk/manifests/client.pp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,28 @@
4040
# Merge common + OS-specific dependencies
4141
$dependencies = concat($common_deps, $extra_dependencies)
4242

43-
$package_url = "https://github.com/rustdesk/rustdesk/releases/download/${version}/rustdesk-${version}-x86_64.deb"
4443
$package_name = "rustdesk-${version}-x86_64.deb"
44+
$package_url = "https://github.com/rustdesk/rustdesk/releases/download/${version}/${package_name}"
4545
$download_path = "/tmp/${package_name}"
4646

4747
# Ensure dependencies are installed first
4848
package { $dependencies:
49-
ensure => installed,
49+
ensure => stdlib::ensure($enable, 'package'),
5050
}
5151

5252
archive { $download_path:
53-
ensure => ensure_present($enable),
53+
ensure => stdlib::ensure($enable),
5454
source => $package_url,
5555
}
5656

5757
package { 'rustdesk':
58-
ensure => installed,
59-
provider => 'dpkg',
60-
source => $download_path,
61-
require => Archive[$download_path],
58+
ensure => stdlib::ensure($enable, 'package'),
59+
source => $download_path,
60+
require => Archive[$download_path],
6261
}
6362

64-
service { 'rustdesk.service':
65-
ensure => ensure_service($enable),
63+
service { 'rustdesk':
64+
ensure => stdlib::ensure($enable, 'service'),
6665
enable => $enable,
6766
require => Package['rustdesk'],
6867
}

‎modules/upstream/rustdesk/manifests/init.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
SemVer $server_version = $rustdesk::server_version,
5656
Array[String] $server_extra_dependencies = $rustdesk::server_extra_dependencies,
5757
) {
58-
$_osfamily =$facts['os']['family']
59-
if $_osfamily != 'Ubuntu' {
60-
fail("The OS you running (${_osfamily}) isn't supported to setup RustDesk")
58+
$_osname = $facts['os']['name']
59+
if $_osname != 'Ubuntu' {
60+
fail("The OS you running (${_osname}) isn't supported to setup RustDesk")
6161
}
6262

6363
[

‎modules/upstream/rustdesk/manifests/server.pp‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,30 @@
4242

4343
# Ensure dependencies are installed first
4444
package { $dependencies:
45-
ensure => installed,
45+
ensure => stdlib::ensure($enable, 'package'),
4646
}
4747

48-
['relay', 'signal'].each |$server| {
49-
$_server_type = lookup("rustdesk::server::${server}::package_name")
50-
$_package_url="https://github.com/rustdesk/rustdesk-server-pro/releases/download/${version}/${_server_type}_${version}_amd64.deb"
48+
$servers = lookup('rustdesk::server::package_names')
5149

52-
archive { $server :
53-
ensure => $enable,
54-
source => $_package_url,
50+
$servers.each | $server_type, $package_name | {
51+
$package_url="https://github.com/rustdesk/rustdesk-server-pro/releases/download/${version}/${package_name}_${version}_amd64.deb"
52+
$download_path = "/tmp/${package_name}_${version}_amd64.deb"
53+
54+
archive { $download_path :
55+
ensure => stdlib::ensure($enable),
56+
source => $package_url,
5557
}
5658

57-
package { $_server_type:
58-
ensure => installed,
59-
provider => 'dpkg',
60-
source => "/tmp/${server}",
61-
require => Archive[$server],
59+
package { $package_name:
60+
ensure => stdlib::ensure($enable, 'package'),
61+
source => $download_path,
62+
require => Archive[$download_path],
6263
}
6364

64-
service { $_server_type:
65-
ensure => $enable,
65+
service { regsubst($package_name, '-server', '', 'G'):
66+
ensure => stdlib::ensure($enable, 'service'),
6667
enable => $enable,
67-
require => Package[$server],
68+
require => Package[$package_name],
6869
}
6970
}
7071
}

‎modules/upstream/rustdesk/metadata.json‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
2-
"name": "rustdesk-puppet-module",
3-
"version": "0.1.0",
2+
"name": "puppet-rustdesk",
3+
"version": "1.0.1",
44
"author": "Obmondo",
5-
"summary": "",
5+
"summary": "Rustdesk Puppet/Openvox module",
66
"license": "Apache-2.0",
7-
"source": "https://github.com/obmondo/rustdesk-puppet-module",
8-
"dependencies": [],
7+
"source": "https://github.com/obmondo/puppet-rustdesk",
8+
"dependencies": [
9+
{
10+
"name": "puppetlabs/stdlib",
11+
"version_requirement": ">= 4.1.0"
12+
}
13+
],
914
"operatingsystem_support": [
1015
{
1116
"operatingsystem": "Ubuntu",
@@ -19,6 +24,10 @@
1924
{
2025
"name": "puppet",
2126
"version_requirement": ">= 7.24 < 9.0.0"
27+
},
28+
{
29+
"name": "openvox",
30+
"version_requirement": ">= 7.24 < 9.0.0"
2231
}
2332
],
2433
"pdk-version": "3.4.0",

0 commit comments

Comments
 (0)