-
-
Notifications
You must be signed in to change notification settings - Fork 54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add parameters to apt::source
to avoid requiring an internet connection
#100
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,6 +43,13 @@ | |
# The base repository url. | ||
# @param repo_keyserver | ||
# The keyserver which should be used to get the repository key. | ||
# @param repo_keycontent | ||
# Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient. | ||
# @param repo_keysource | ||
# Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or | ||
# an absolute path. | ||
# @param repo_keyweak_ssl | ||
# Specifies whether strict SSL verification on a https URL should be disabled. Valid options: true or false. | ||
# @param config_path | ||
# The path to the config file of Gitlab runner. | ||
# @param config_owner | ||
|
@@ -74,30 +81,33 @@ | |
# Using the CA file solves https://github.com/voxpupuli/puppet-gitlab_ci_runner/issues/124. | ||
# | ||
class gitlab_ci_runner ( | ||
String $xz_package_name, # Defaults in module hieradata | ||
Hash $runners = {}, | ||
Hash $runner_defaults = {}, | ||
Optional[Integer] $concurrent = undef, | ||
Optional[Gitlab_ci_runner::Log_level] $log_level = undef, | ||
Optional[Gitlab_ci_runner::Log_format] $log_format = undef, | ||
Optional[Integer] $check_interval = undef, | ||
Optional[String] $sentry_dsn = undef, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this removed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. GitHub fscked'up my in-line comment… I an speaking about |
||
Optional[Pattern[/.*:.+/]] $listen_address = undef, | ||
Optional[Gitlab_ci_runner::Session_server] $session_server = undef, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this removed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
Boolean $manage_docker = false, | ||
Boolean $manage_repo = true, | ||
String $package_ensure = installed, | ||
String $package_name = 'gitlab-runner', | ||
Stdlib::HTTPUrl $repo_base_url = 'https://packages.gitlab.com', | ||
Optional[Gitlab_ci_runner::Keyserver] $repo_keyserver = undef, | ||
String $config_path = '/etc/gitlab-runner/config.toml', | ||
String[1] $config_owner = 'root', | ||
String[1] $config_group = 'root', | ||
Stdlib::Filemode $config_mode = '0444', | ||
Boolean $manage_config_dir = false, | ||
Optional[Stdlib::Filemode] $config_dir_mode = undef, | ||
Optional[Stdlib::HTTPUrl] $http_proxy = undef, | ||
Optional[Stdlib::Unixpath] $ca_file = undef, | ||
String $xz_package_name, # Defaults in module hieradata | ||
Hash $runners = {}, | ||
Hash $runner_defaults = {}, | ||
Optional[Integer] $concurrent = undef, | ||
Optional[Integer] $check_interval = undef, | ||
Optional[String] $builds_dir = undef, | ||
Optional[String] $cache_dir = undef, | ||
Optional[Pattern[/.*:.+/]] $metrics_server = undef, | ||
Comment on lines
+89
to
+91
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These changes seems unrelated to this PR. |
||
Optional[Pattern[/.*:.+/]] $listen_address = undef, | ||
Optional[String] $sentry_dsn = undef, | ||
Boolean $manage_docker = false, | ||
Boolean $manage_repo = true, | ||
String $package_ensure = installed, | ||
String $package_name = 'gitlab-runner', | ||
Stdlib::HTTPUrl $repo_base_url = 'https://packages.gitlab.com', | ||
Optional[Stdlib::Fqdn] $repo_keyserver = undef, | ||
Comment on lines
-92
to
+99
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why change the data type? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The one of |
||
Optional[String] $repo_keycontent = undef, | ||
Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]] $repo_keysource = undef, | ||
Boolean $repo_keyweak_ssl = false, | ||
String $config_path = '/etc/gitlab-runner/config.toml', | ||
String[1] $config_owner = 'root', | ||
String[1] $config_group = 'root', | ||
Stdlib::Filemode $config_mode = '0444', | ||
Boolean $manage_config_dir = false, | ||
Optional[Stdlib::Filemode] $config_dir_mode = undef, | ||
Optional[Stdlib::HTTPUrl] $http_proxy = undef, | ||
Optional[Stdlib::Unixpath] $ca_file = undef, | ||
) { | ||
if $manage_docker { | ||
# workaround for cirunner issue #1617 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these removed?