Recommit for updates in build 2
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -123,7 +123,9 @@
|
||||
25
|
||||
26
|
||||
27
|
||||
28</pre>
|
||||
28
|
||||
29
|
||||
30</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/yumrepo.pp', line 6</span>
|
||||
@@ -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'],
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -208,7 +208,7 @@
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'https://pkg.jenkins.io/redhat-stable/'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'https://pkg.jenkins.io/rpm-stable'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -226,7 +226,7 @@
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'jenkins.io-2023.key'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'repodata/repomd.xml.key'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -244,7 +244,7 @@
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'gpg-pubkey-ef5975ca-6421ce2b'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'gpg-pubkey-14abfc68-69494683'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -344,6 +344,19 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>js_gpg_repo_check</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'1'</tt>)</em>
|
||||
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -392,32 +405,34 @@
|
||||
53
|
||||
54
|
||||
55
|
||||
56</pre>
|
||||
56
|
||||
57</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user