Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

Commit 1ceaa30

Browse files
committed
Merged #PR6
2 parents 04dad83 + 78ad713 commit 1ceaa30

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

data/common.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ github_actions_runner::personal_access_token: 'PAT'
99
github_actions_runner::user: 'root'
1010
github_actions_runner::group: 'root'
1111
github_actions_runner::instances: {}
12-
12+
github_actions_runner::github_domain: "https://github.com"
13+
github_actions_runner::github_api: "https://api.github.com"

manifests/init.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
String $user,
5959
String $group,
6060
Hash[String, Hash] $instances,
61+
String $github_domain,
62+
String $github_api,
6163
Optional[String] $http_proxy = undef,
6264
Optional[String] $https_proxy = undef,
6365
Optional[String] $no_proxy = undef,

manifests/instance.pp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
Optional[String] $no_proxy = $github_actions_runner::no_proxy,
5353
Optional[Array[String]] $labels = undef,
5454
Optional[String] $repo_name = undef,
55-
55+
String $github_domain = $github_actions_runner::github_domain,
56+
String $github_api = $github_actions_runner::github_api,
5657
) {
5758

5859
if $labels {
@@ -63,13 +64,17 @@
6364
}
6465

6566
$url = $repo_name ? {
66-
undef => "https://github.com/${org_name}",
67-
default => "https://github.com/${org_name}/${repo_name}",
67+
undef => "${github_domain}/${org_name}",
68+
default => "${github_domain}/${org_name}/${repo_name}",
6869
}
6970

70-
$token_url = $repo_name ? {
71-
undef => "https://api.github.com/repos/${org_name}/actions/runners/registration-token",
72-
default => "https://api.github.com/repos/${org_name}/${repo_name}/actions/runners/registration-token",
71+
if $repo_name {
72+
$token_url = "${github_api}/repos/${org_name}/${repo_name}/actions/runners/registration-token"
73+
} else {
74+
$token_url = $github_api ? {
75+
'https://api.github.com' => "${github_api}/repos/${org_name}/actions/runners/registration-token",
76+
default => "${github_api}/orgs/${org_name}/actions/runners/registration-token",
77+
}
7378
}
7479

7580
$archive_name = "${github_actions_runner::package_name}-${github_actions_runner::package_ensure}.tar.gz"

0 commit comments

Comments
 (0)