diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html index dcadf41..ccb4382 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html @@ -121,7 +121,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/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html index a92650f..40dd56e 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html @@ -123,7 +123,9 @@ 25 26 27 -28 +28 +29 +30
# File 'manifests/main/yumrepo.pp', line 6
@@ -133,22 +135,24 @@ 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'],
+ }
}
}
# File 'manifests/params.pp', line 19
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