diff --git a/.vscode/settings.json b/.vscode/settings.json index fe53574..89b1287 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,12 @@ { "cSpell.words": [ "descr", + "dport", "fontconfig", "gpgcheck", "NOPASSWD", + "repodata", + "repomd", "requiretty", "yumrepo" ] diff --git a/manifests/main/install.pp b/manifests/main/install.pp index dd0e755..03aa268 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -7,7 +7,7 @@ class confdroid_jenkins::main::install ( ) inherits confdroid_jenkins::params { if $fqdn == $js_host_fqdn { - require java_cd + require confdroid_java require confdroid_jenkins::main::yumrepo package { $reqpackages: diff --git a/manifests/main/yumrepo.pp b/manifests/main/yumrepo.pp index a87d8e3..957d674 100644 --- a/manifests/main/yumrepo.pp +++ b/manifests/main/yumrepo.pp @@ -8,21 +8,23 @@ class confdroid_jenkins::main::yumrepo ( ) inherits confdroid_jenkins::params { if $fqdn == $js_host_fqdn { yumrepo { 'jenkins': - descr => 'Jenkins-stable', - baseurl => $js_base_url, - gpgcheck => $js_gpg_check, - enabled => $js_repo_enabled, + descr => 'Jenkins-stable', + baseurl => $js_base_url, + type => 'rpm-md', + gpgcheck => $js_gpg_check, + repo_gpgcheck => 1, + enabled => $js_repo_enabled, } # import rpm key -# exec { $js_key: -# command => "rpm --import ${js_base_url}/${js_key}", -# path => '/bin:/usr/bin:/sbin:/usr/sbin', -# cwd => '/tmp', -# user => 'root', -# unless => "rpm -q ${js_key_code} 2>/dev/null", -# require => Yumrepo['jenkins'], -# } + exec { $js_key: + command => "rpm --import ${js_base_url}/${js_key}", + path => '/bin:/usr/bin:/sbin:/usr/sbin', + cwd => '/tmp', + user => 'root', + unless => "rpm -q ${js_key_code} 2>/dev/null", + require => Yumrepo['jenkins'], + } } } diff --git a/manifests/params.pp b/manifests/params.pp index e13e60e..6f24e90 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -18,25 +18,26 @@ ############################################################################## class confdroid_jenkins::params ( - Array $reqpackages = ['jenkins','fontconfig'], - String $pkg_ensure = 'latest', - String $js_gpg_check = '1', - String $js_repo_enabled = '1', - String $js_base_url = 'https://pkg.jenkins.io/redhat-stable/', - String $js_key = 'jenkins.io-2023.key', - String $js_key_code = 'gpg-pubkey-ef5975ca-6421ce2b', + Array $reqpackages = ['jenkins','fontconfig'], + String $pkg_ensure = 'latest', + String $js_gpg_check = '1', + String $js_repo_enabled = '1', + String $js_gpg_repo_check = '1', + String $js_base_url = 'https://pkg.jenkins.io/rpm-stable', + String $js_key = 'repodata/repomd.xml.key', + String $js_key_code = 'gpg-pubkey-14abfc68-69494683', # server fqdn - String $js_host_fqdn = 'jenkins.example.net', + String $js_host_fqdn = 'jenkins.example.net', # firewall - Boolean $js_enable_fw = true, - String $js_fw_rule = '50', - String $js_jenkins_port = '8080', - String $js_source_net = '0.0.0.0/0', + Boolean $js_enable_fw = true, + String $js_fw_rule = '50', + String $js_jenkins_port = '8080', + String $js_source_net = '0.0.0.0/0', # user - Boolean $js_use_sudo = false, + Boolean $js_use_sudo = false, ) { # facts