confdroid/confdroid_jenkins
1
0
Fork 0
Code Issues Projects Wiki Activity

Merge build 3 into master

Browse Source
This commit is contained in:
Jenkins Server
2026-04-16 15:51:28 +02:00
parent 16362ba2ae 083dd38721
commit 660eb13cb4
4 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html
View File

@@ -124,8 +124,8 @@ class confdroid_jenkins::main::install (
require confdroid_java require confdroid_java
require confdroid_jenkins::main::yumrepo require confdroid_jenkins::main::yumrepo
package { $reqpackages: package { $js_reqpackages:
ensure => $pkg_ensure, ensure => $js_pkg_ensure,
} }
} }
}</pre> }</pre>

47
doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html
View File

@@ -112,7 +112,7 @@
<li> <li>
<span class='name'>reqpackages</span> <span class='name'>js_reqpackages</span>
<span class='type'>(<tt>Array</tt>)</span> <span class='type'>(<tt>Array</tt>)</span>
@@ -130,13 +130,13 @@
<li> <li>
<span class='name'>pkg_ensure</span> <span class='name'>js_pkg_ensure</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;latest&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash; &mdash;
@@ -254,6 +254,24 @@
</li> </li>
<li>
<span class='name'>js_gpg_repo_check</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to enable GPG check for the Jenkins repository</p>
</div>
</li>
<li> <li>
<span class='name'>js_enable_fw</span> <span class='name'>js_enable_fw</span>
@@ -344,19 +362,6 @@
</li> </li>
<li>
<span class='name'>js_gpg_repo_check</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -368,7 +373,6 @@
<pre class="lines"> <pre class="lines">
19
20 20
21 21
22 22
@@ -406,15 +410,16 @@
54 54
55 55
56 56
57</pre> 57
58</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
class confdroid_jenkins::params ( class confdroid_jenkins::params (
Array $reqpackages = [&#39;jenkins&#39;,&#39;fontconfig&#39;], Array $js_reqpackages = [&#39;jenkins&#39;,&#39;fontconfig&#39;],
String $pkg_ensure = &#39;latest&#39;, String $js_pkg_ensure = &#39;present&#39;,
String $js_gpg_check = &#39;1&#39;, String $js_gpg_check = &#39;1&#39;,
String $js_repo_enabled = &#39;1&#39;, String $js_repo_enabled = &#39;1&#39;,
String $js_gpg_repo_check = &#39;1&#39;, String $js_gpg_repo_check = &#39;1&#39;,

4
manifests/main/install.pp
View File

@@ -10,8 +10,8 @@ class confdroid_jenkins::main::install (
require confdroid_java require confdroid_java
require confdroid_jenkins::main::yumrepo require confdroid_jenkins::main::yumrepo
package { $reqpackages: package { $js_reqpackages:
ensure => $pkg_ensure, ensure => $js_pkg_ensure,
} }
} }
} }

9
manifests/params.pp
View File

@@ -2,14 +2,15 @@
# Module name: confdroid_jenkins # Module name: confdroid_jenkins
# Author: 12ww1160 (12ww1160@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class holds all parameters for the confdroid_jenkins module. # @summary Class holds all parameters for the confdroid_jenkins module.
# @param [Array] reqpackages which packages to install # @param [Array] js_reqpackages which packages to install
# @param [String] pkg_ensure which packages to install # @param [String] js_pkg_ensure which packages to install
# @param [String] js_gpg_check whether to enable GPG check for Jenkins packages # @param [String] js_gpg_check whether to enable GPG check for Jenkins packages
# @param [String] js_repo_enabled whether to enable the Jenkins repository # @param [String] js_repo_enabled whether to enable the Jenkins repository
# @param [String] js_host_fqdn fqdn of the host where Jenkins should run # @param [String] js_host_fqdn fqdn of the host where Jenkins should run
# @param [String] js_base_url the base URL for the Jenkins repository # @param [String] js_base_url the base URL for the Jenkins repository
# @param [String] js_key the filename of the Jenkins GPG key to import # @param [String] js_key the filename of the Jenkins GPG key to import
# @param [String] js_key_code the code of the Jenkins GPG key to check # @param [String] js_key_code the code of the Jenkins GPG key to check
# @param [String] js_gpg_repo_check whether to enable GPG check for the Jenkins repository
# @param [Boolean] js_enable_fw whether to enable firewall control # @param [Boolean] js_enable_fw whether to enable firewall control
# @param [String] js_fw_rule the prefix for the firewall rule order # @param [String] js_fw_rule the prefix for the firewall rule order
# @param [String] js_jenkins_port the port to open for Jenkins # @param [String] js_jenkins_port the port to open for Jenkins
@@ -18,8 +19,8 @@
############################################################################## ##############################################################################
class confdroid_jenkins::params ( class confdroid_jenkins::params (
Array $reqpackages = ['jenkins','fontconfig'], Array $js_reqpackages = ['jenkins','fontconfig'],
String $pkg_ensure = 'latest', String $js_pkg_ensure = 'present',
String $js_gpg_check = '1', String $js_gpg_check = '1',
String $js_repo_enabled = '1', String $js_repo_enabled = '1',
String $js_gpg_repo_check = '1', String $js_gpg_repo_check = '1',