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

Merge build 1 into master

Browse Source
This commit is contained in:
Jenkins Server
2026-04-16 15:00:08 +02:00
parent 7ff8e9b5eb 975b5a236a
commit 0641ff48fc
15 changed files with 235 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,3 +2,5 @@
Gemfile.lock Gemfile.lock
FileList FileList
.scannerwork .scannerwork
.vscode
.puppet-lint.rc

49
Jenkinsfile vendored
View File

@@ -28,11 +28,17 @@ pipeline {
sh ''' sh '''
git config user.name "Jenkins Server" git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com git config user.email jenkins@confdroid.com
# Ensure we're on the development branch (triggered by push) git fetch origin
git checkout development source_branch="${gitlabSourceBranch:-${BRANCH_NAME:-${GIT_LOCAL_BRANCH:-$GIT_BRANCH}}}"
# Create jenkins branch from development source_branch="${source_branch#origin/}"
git checkout -b jenkins-build-$BUILD_NUMBER source_branch="${source_branch#refs/heads/}"
# Optionally merge master into jenkins to ensure compatibility if [ -z "$source_branch" ]; then
source_branch="development"
fi
echo "Using source branch: $source_branch"
# Create an isolated build branch from the triggering branch revision.
git checkout -B jenkins-build-$BUILD_NUMBER "origin/$source_branch"
# Merge the current master into the build branch before validation.
git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; } git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
''' '''
} }
@@ -69,7 +75,7 @@ pipeline {
withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
sh ''' sh '''
/opt/sonar-scanner/bin/sonar-scanner \ /opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey=cd_jenkins \ -Dsonar.projectKey=confdroid_java \
-Dsonar.sources=. \ -Dsonar.sources=. \
-Dsonar.host.url=https://sonarqube.confdroid.com \ -Dsonar.host.url=https://sonarqube.confdroid.com \
-Dsonar.token=$SONAR_TOKEN -Dsonar.token=$SONAR_TOKEN
@@ -91,15 +97,34 @@ pipeline {
git config user.name "Jenkins Server" git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com git config user.email jenkins@confdroid.com
git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push -o merge_request.create \ git fetch origin
-o merge_request.target=master \ git checkout -B master origin/master
-o merge_request.title="Auto-merge for build $BUILD_NUMBER" \ git merge --no-ff jenkins-build-$BUILD_NUMBER -m "Merge build $BUILD_NUMBER into master"
-o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \ git push origin master
-o merge_request.merge_when_pipeline_succeeds=true \ '''
origin jenkins-build-$BUILD_NUMBER }
}
}
stage('Mirror to Gitea') {
steps {
withCredentials([usernamePassword(
credentialsId: 'Jenkins-gitea',
usernameVariable: 'GITEA_USER',
passwordVariable: 'GITEA_TOKEN')]) {
script {
sh '''
git fetch origin
git checkout master
git reset --hard origin/master
git remote get-url master >/dev/null 2>&1 \
&& git remote set-url master https://sourcecode.confdroid.com/confdroid/confdroid_java.git \
|| git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_java.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push --force master refs/heads/master:refs/heads/master
''' '''
} }
} }
} }
} }
} }
}

45
README.md
View File

@@ -1,12 +1,24 @@
# Readme # Readme
[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=java_cd)](https://jenkins.confdroid.com/job/java_cd/) [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_java&style=plastic)](https://jenkins.confdroid.com/job/confdroid_java/)
[[_TOC_]] - [Readme](#readme)
- [Synopsis](#synopsis)
- [WARNING](#warning)
- [Features](#features)
- [Repo Documentation](#repo-documentation)
- [Dependencies](#dependencies)
- [Deployment](#deployment)
- [SELINUX](#selinux)
- [Known Problems](#known-problems)
- [Support](#support)
- [Tests](#tests)
- [Contact Us](#contact-us)
- [Disclaimer](#disclaimer)
## Synopsis ## Synopsis
`java_cd` is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd. `confdroid_java` is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd.
## WARNING ## WARNING
@@ -16,7 +28,7 @@
INSTALLATION INSTALLATION
* installs java binaries - installs java binaries as specified.
## Repo Documentation ## Repo Documentation
@@ -28,17 +40,17 @@ All dependencies must be included in the catalogue.
## Deployment ## Deployment
* native Puppet deployment - native Puppet deployment
via site.pp or nodes.pp via site.pp or nodes.pp
```bash ```bash
node 'example.example.net' { node 'example.example.net' {
include java_cd include confdroid_java
} }
``` ```
* through Foreman: - through Foreman:
In order to apply parameters through Foreman, the params.pp must be added to the host or host group in question. In order to apply parameters through Foreman, the params.pp must be added to the host or host group in question.
@@ -52,21 +64,22 @@ All files and directories are configured with correct selinux context. If selinu
## Support ## Support
* OS: Rocky 9 - OS: Rocky 9 (all RHEL-based OS should work but Rocky 9 is tested)
* Puppet 6-8 - Puppet 8
## Tests ## Tests
* Puppet Lint - Puppet Lint
* excluded tests: - excluded tests:
* `--no-variable_scope-check`: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters. - `--no-variable_scope-check`: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters.
* Puppet Parser - Puppet Parser
* ERB Template Parser - ERB Template Parser
* Sonar Quality Gate - Sonar Quality Gate
## Contact Us ## Contact Us
[contact Us](https://confdroid.com/contact/) - [contact Us](https://confdroid.com/contact/)
- [Feedback Portal](https://feedback.confdroid.com/)
## Disclaimer ## Disclaimer

12
doc/_index.html
View File

@@ -64,27 +64,27 @@
<td valign='top' width="33%"> <td valign='top' width="33%">
<ul id="alpha_J" class="alpha"> <ul id="alpha_C" class="alpha">
<li class="letter">J</li> <li class="letter">C</li>
<ul> <ul>
<li> <li>
<span class='object_link'><a href="puppet_classes/java_cd.html" title="puppet_classes::java_cd (puppet_class)">java_cd</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java.html" title="puppet_classes::confdroid_java (puppet_class)">confdroid_java</a></span>
</li> </li>
<li> <li>
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::java_cd::main::config (puppet_class)">java_cd::main::config</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_java::main::config (puppet_class)">confdroid_java::main::config</a></span>
</li> </li>
<li> <li>
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::java_cd::main::install (puppet_class)">java_cd::main::install</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_java::main::install (puppet_class)">confdroid_java::main::install</a></span>
</li> </li>
<li> <li>
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Aparams.html" title="puppet_classes::java_cd::params (puppet_class)">java_cd::params</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Aparams.html" title="puppet_classes::confdroid_java::params (puppet_class)">confdroid_java::params</a></span>
</li> </li>

46
doc/file.README.html
View File

@@ -60,13 +60,38 @@
<div id="content"><div id='filecontents'> <div id="content"><div id='filecontents'>
<h1 id="label-Readme">Readme</h1> <h1 id="label-Readme">Readme</h1>
<p><a href="https://jenkins.confdroid.com/job/java_cd/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=java_cd"></a></p> <p><a href="https://jenkins.confdroid.com/job/confdroid_java/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_java&amp;style=plastic"></a></p>
<ul><li>
<p>[[<em>TOC</em>]]</p> <p><a href="#readme">Readme</a></p>
</li><li>
<p><a href="#synopsis">Synopsis</a></p>
</li><li>
<p><a href="#warning">WARNING</a></p>
</li><li>
<p><a href="#features">Features</a></p>
</li><li>
<p><a href="#repo-documentation">Repo Documentation</a></p>
</li><li>
<p><a href="#dependencies">Dependencies</a></p>
</li><li>
<p><a href="#deployment">Deployment</a></p>
</li><li>
<p><a href="#selinux">SELINUX</a></p>
</li><li>
<p><a href="#known-problems">Known Problems</a></p>
</li><li>
<p><a href="#support">Support</a></p>
</li><li>
<p><a href="#tests">Tests</a></p>
</li><li>
<p><a href="#contact-us">Contact Us</a></p>
</li><li>
<p><a href="#disclaimer">Disclaimer</a></p>
</li></ul>
<h2 id="label-Synopsis">Synopsis</h2> <h2 id="label-Synopsis">Synopsis</h2>
<p><code>java_cd</code> is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd.</p> <p><code>confdroid_java</code> is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd.</p>
<h2 id="label-WARNING">WARNING</h2> <h2 id="label-WARNING">WARNING</h2>
@@ -76,7 +101,7 @@
<p>INSTALLATION</p> <p>INSTALLATION</p>
<ul><li> <ul><li>
<p>installs java binaries</p> <p>installs java binaries as specified.</p>
</li></ul> </li></ul>
<h2 id="label-Repo+Documentation">Repo Documentation</h2> <h2 id="label-Repo+Documentation">Repo Documentation</h2>
@@ -95,7 +120,7 @@
<p>via site.pp or nodes.pp</p> <p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; { <pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include java_cd include confdroid_java
} }
</code></pre> </code></pre>
<ul><li> <ul><li>
@@ -114,9 +139,9 @@
<h2 id="label-Support">Support</h2> <h2 id="label-Support">Support</h2>
<ul><li> <ul><li>
<p>OS: Rocky 9</p> <p>OS: Rocky 9 (all RHEL-based OS should work but Rocky 9 is tested)</p>
</li><li> </li><li>
<p>Puppet 6-8</p> <p>Puppet 8</p>
</li></ul> </li></ul>
<h2 id="label-Tests">Tests</h2> <h2 id="label-Tests">Tests</h2>
@@ -136,8 +161,11 @@
</li></ul> </li></ul>
<h2 id="label-Contact+Us">Contact Us</h2> <h2 id="label-Contact+Us">Contact Us</h2>
<ul><li>
<p><a href="https://confdroid.com/contact/">contact Us</a></p> <p><a href="https://confdroid.com/contact/">contact Us</a></p>
</li><li>
<p><a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
</li></ul>
<h2 id="label-Disclaimer">Disclaimer</h2> <h2 id="label-Disclaimer">Disclaimer</h2>

46
doc/index.html
View File

@@ -60,13 +60,38 @@
<div id="content"><div id='filecontents'> <div id="content"><div id='filecontents'>
<h1 id="label-Readme">Readme</h1> <h1 id="label-Readme">Readme</h1>
<p><a href="https://jenkins.confdroid.com/job/java_cd/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=java_cd"></a></p> <p><a href="https://jenkins.confdroid.com/job/confdroid_java/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_java&amp;style=plastic"></a></p>
<ul><li>
<p>[[<em>TOC</em>]]</p> <p><a href="#readme">Readme</a></p>
</li><li>
<p><a href="#synopsis">Synopsis</a></p>
</li><li>
<p><a href="#warning">WARNING</a></p>
</li><li>
<p><a href="#features">Features</a></p>
</li><li>
<p><a href="#repo-documentation">Repo Documentation</a></p>
</li><li>
<p><a href="#dependencies">Dependencies</a></p>
</li><li>
<p><a href="#deployment">Deployment</a></p>
</li><li>
<p><a href="#selinux">SELINUX</a></p>
</li><li>
<p><a href="#known-problems">Known Problems</a></p>
</li><li>
<p><a href="#support">Support</a></p>
</li><li>
<p><a href="#tests">Tests</a></p>
</li><li>
<p><a href="#contact-us">Contact Us</a></p>
</li><li>
<p><a href="#disclaimer">Disclaimer</a></p>
</li></ul>
<h2 id="label-Synopsis">Synopsis</h2> <h2 id="label-Synopsis">Synopsis</h2>
<p><code>java_cd</code> is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd.</p> <p><code>confdroid_java</code> is a Puppet module to automate installation and configuration of java, mainly to install the binaries and main configuration files for use with other modules, like jenkins_cd.</p>
<h2 id="label-WARNING">WARNING</h2> <h2 id="label-WARNING">WARNING</h2>
@@ -76,7 +101,7 @@
<p>INSTALLATION</p> <p>INSTALLATION</p>
<ul><li> <ul><li>
<p>installs java binaries</p> <p>installs java binaries as specified.</p>
</li></ul> </li></ul>
<h2 id="label-Repo+Documentation">Repo Documentation</h2> <h2 id="label-Repo+Documentation">Repo Documentation</h2>
@@ -95,7 +120,7 @@
<p>via site.pp or nodes.pp</p> <p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; { <pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include java_cd include confdroid_java
} }
</code></pre> </code></pre>
<ul><li> <ul><li>
@@ -114,9 +139,9 @@
<h2 id="label-Support">Support</h2> <h2 id="label-Support">Support</h2>
<ul><li> <ul><li>
<p>OS: Rocky 9</p> <p>OS: Rocky 9 (all RHEL-based OS should work but Rocky 9 is tested)</p>
</li><li> </li><li>
<p>Puppet 6-8</p> <p>Puppet 8</p>
</li></ul> </li></ul>
<h2 id="label-Tests">Tests</h2> <h2 id="label-Tests">Tests</h2>
@@ -136,8 +161,11 @@
</li></ul> </li></ul>
<h2 id="label-Contact+Us">Contact Us</h2> <h2 id="label-Contact+Us">Contact Us</h2>
<ul><li>
<p><a href="https://confdroid.com/contact/">contact Us</a></p> <p><a href="https://confdroid.com/contact/">contact Us</a></p>
</li><li>
<p><a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
</li></ul>
<h2 id="label-Disclaimer">Disclaimer</h2> <h2 id="label-Disclaimer">Disclaimer</h2>

16
doc/puppet_class_list.html
View File

@@ -36,30 +36,30 @@
<ul id="full_list" class="puppet_class"> <ul id="full_list" class="puppet_class">
<li id="object_puppet_classes::java_cd" class="odd"> <li id="object_puppet_classes::confdroid_java" class="odd">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/java_cd.html" title="puppet_classes::java_cd (puppet_class)">java_cd</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java.html" title="puppet_classes::confdroid_java (puppet_class)">confdroid_java</a></span>
</div> </div>
</li> </li>
<li id="object_puppet_classes::java_cd::main::config" class="even"> <li id="object_puppet_classes::confdroid_java::main::config" class="even">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::java_cd::main::config (puppet_class)">java_cd::main::config</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_java::main::config (puppet_class)">confdroid_java::main::config</a></span>
</div> </div>
</li> </li>
<li id="object_puppet_classes::java_cd::main::install" class="odd"> <li id="object_puppet_classes::confdroid_java::main::install" class="odd">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::java_cd::main::install (puppet_class)">java_cd::main::install</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_java::main::install (puppet_class)">confdroid_java::main::install</a></span>
</div> </div>
</li> </li>
<li id="object_puppet_classes::java_cd::params" class="even"> <li id="object_puppet_classes::confdroid_java::params" class="even">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/java_cd_3A_3Aparams.html" title="puppet_classes::java_cd::params (puppet_class)">java_cd::params</a></span> <span class='object_link'><a href="puppet_classes/confdroid_java_3A_3Aparams.html" title="puppet_classes::confdroid_java::params (puppet_class)">confdroid_java::params</a></span>
</div> </div>
</li> </li>

18
doc/puppet_classes/java_cd.html → doc/puppet_classes/confdroid_java.html
View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> <title>
Puppet Class: java_cd Puppet Class: confdroid_java
&mdash; Documentation by YARD 0.9.36 &mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" /> <link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
pathId = "puppet_classes::java_cd"; pathId = "puppet_classes::confdroid_java";
relpath = '../'; relpath = '../';
</script> </script>
@@ -36,10 +36,10 @@
<div id="header"> <div id="header">
<div id="menu"> <div id="menu">
<a href="../_index.html">Index (j)</a> &raquo; <a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span> <span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo; &raquo;
<span class="title">java_cd</span> <span class="title">confdroid_java</span>
</div> </div>
@@ -59,7 +59,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="content"><h1>Puppet Class: java_cd</h1> <div id="content"><h1>Puppet Class: confdroid_java</h1>
<div class="box_info"> <div class="box_info">
@@ -72,13 +72,13 @@
</div> </div>
<h2>Summary</h2> <h2>Summary</h2>
Class initializes the java_cd module. Class initializes the confdroid_java module.
<h2>Overview</h2> <h2>Overview</h2>
<div class="docstring"> <div class="docstring">
<div class="discussion"> <div class="discussion">
<p>java_cd::init.pp Module name: java_cd Author: Arne Teuke (arne_teuke@confdroid.com)</p> <p>confdroid_java::init.pp Module name: confdroid_java Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div> </div>
</div> </div>
@@ -103,8 +103,8 @@
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/init.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/init.pp', line 6</span>
class java_cd { class confdroid_java {
include java_cd::params include confdroid_java::params
}</pre> }</pre>
</td> </td>
</tr> </tr>

22
doc/puppet_classes/java_cd_3A_3Amain_3A_3Aconfig.html → doc/puppet_classes/confdroid_java_3A_3Amain_3A_3Aconfig.html
View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> <title>
Puppet Class: java_cd::main::config Puppet Class: confdroid_java::main::config
&mdash; Documentation by YARD 0.9.36 &mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" /> <link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
pathId = "puppet_classes::java_cd::main::config"; pathId = "puppet_classes::confdroid_java::main::config";
relpath = '../'; relpath = '../';
</script> </script>
@@ -36,10 +36,10 @@
<div id="header"> <div id="header">
<div id="menu"> <div id="menu">
<a href="../_index.html">Index (j)</a> &raquo; <a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span> <span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo; &raquo;
<span class="title">java_cd::main::config</span> <span class="title">confdroid_java::main::config</span>
</div> </div>
@@ -59,12 +59,12 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="content"><h1>Puppet Class: java_cd::main::config</h1> <div id="content"><h1>Puppet Class: confdroid_java::main::config</h1>
<div class="box_info"> <div class="box_info">
<dl> <dl>
<dt>Inherits:</dt> <dt>Inherits:</dt>
<dd><span class='object_link'><a href="java_cd_3A_3Aparams.html" title="puppet_classes::java_cd::params (puppet_class)">java_cd::params</a></span></dd> <dd><span class='object_link'><a href="confdroid_java_3A_3Aparams.html" title="puppet_classes::confdroid_java::params (puppet_class)">confdroid_java::params</a></span></dd>
</dl> </dl>
@@ -77,13 +77,13 @@
</div> </div>
<h2>Summary</h2> <h2>Summary</h2>
Class manages the logic for the java_cd module. Class manages the logic for the confdroid_java module.
<h2>Overview</h2> <h2>Overview</h2>
<div class="docstring"> <div class="docstring">
<div class="discussion"> <div class="discussion">
<p>java_cd::main::config.pp Module name: java_cd Author: Arne Teuke (arne_teuke@confdroid.com)</p> <p>confdroid_java::main::config.pp Module name: confdroid_java Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div> </div>
</div> </div>
@@ -110,10 +110,10 @@
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
class java_cd::main::config ( class confdroid_java::main::config (
) inherits java_cd::params { ) inherits confdroid_java::params {
include java_cd::main::install include confdroid_java::main::install
}</pre> }</pre>
</td> </td>
</tr> </tr>

24
doc/puppet_classes/java_cd_3A_3Amain_3A_3Ainstall.html → doc/puppet_classes/confdroid_java_3A_3Amain_3A_3Ainstall.html
View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> <title>
Puppet Class: java_cd::main::install Puppet Class: confdroid_java::main::install
&mdash; Documentation by YARD 0.9.36 &mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" /> <link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
pathId = "puppet_classes::java_cd::main::install"; pathId = "puppet_classes::confdroid_java::main::install";
relpath = '../'; relpath = '../';
</script> </script>
@@ -36,10 +36,10 @@
<div id="header"> <div id="header">
<div id="menu"> <div id="menu">
<a href="../_index.html">Index (j)</a> &raquo; <a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span> <span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo; &raquo;
<span class="title">java_cd::main::install</span> <span class="title">confdroid_java::main::install</span>
</div> </div>
@@ -59,12 +59,12 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="content"><h1>Puppet Class: java_cd::main::install</h1> <div id="content"><h1>Puppet Class: confdroid_java::main::install</h1>
<div class="box_info"> <div class="box_info">
<dl> <dl>
<dt>Inherits:</dt> <dt>Inherits:</dt>
<dd><span class='object_link'><a href="java_cd_3A_3Aparams.html" title="puppet_classes::java_cd::params (puppet_class)">java_cd::params</a></span></dd> <dd><span class='object_link'><a href="confdroid_java_3A_3Aparams.html" title="puppet_classes::confdroid_java::params (puppet_class)">confdroid_java::params</a></span></dd>
</dl> </dl>
@@ -77,13 +77,13 @@
</div> </div>
<h2>Summary</h2> <h2>Summary</h2>
Class manages the logic for the java_cd module. Class manages the logic for the confdroid_java module.
<h2>Overview</h2> <h2>Overview</h2>
<div class="docstring"> <div class="docstring">
<div class="discussion"> <div class="discussion">
<p>java_cd::main::install.pp Module name: java_cd Author: Arne Teuke (arne_teuke@confdroid.com)</p> <p>confdroid_java::main::install.pp Module name: confdroid_java Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div> </div>
</div> </div>
@@ -112,11 +112,11 @@
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
class java_cd::main::install ( class confdroid_java::main::install (
) inherits java_cd::params { ) inherits confdroid_java::params {
package { $reqpackages: package { $js_reqpackages:
ensure =&gt; $pkg_ensure, ensure =&gt; $js_pkg_ensure,
} }
}</pre> }</pre>
</td> </td>

32
doc/puppet_classes/java_cd_3A_3Aparams.html → doc/puppet_classes/confdroid_java_3A_3Aparams.html
View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> <title>
Puppet Class: java_cd::params Puppet Class: confdroid_java::params
&mdash; Documentation by YARD 0.9.36 &mdash; Documentation by YARD 0.9.36
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="../css/common.css" type="text/css" /> <link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript"> <script type="text/javascript">
pathId = "puppet_classes::java_cd::params"; pathId = "puppet_classes::confdroid_java::params";
relpath = '../'; relpath = '../';
</script> </script>
@@ -36,10 +36,10 @@
<div id="header"> <div id="header">
<div id="menu"> <div id="menu">
<a href="../_index.html">Index (j)</a> &raquo; <a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span> <span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo; &raquo;
<span class="title">java_cd::params</span> <span class="title">confdroid_java::params</span>
</div> </div>
@@ -59,7 +59,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="content"><h1>Puppet Class: java_cd::params</h1> <div id="content"><h1>Puppet Class: confdroid_java::params</h1>
<div class="box_info"> <div class="box_info">
@@ -67,9 +67,9 @@
<dt>Inherited by:</dt> <dt>Inherited by:</dt>
<dd> <dd>
<span class='object_link'><a href="java_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::java_cd::main::config (puppet_class)">java_cd::main::config</a></span><br/> <span class='object_link'><a href="confdroid_java_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_java::main::config (puppet_class)">confdroid_java::main::config</a></span><br/>
<span class='object_link'><a href="java_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::java_cd::main::install (puppet_class)">java_cd::main::install</a></span><br/> <span class='object_link'><a href="confdroid_java_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_java::main::install (puppet_class)">confdroid_java::main::install</a></span><br/>
</dd> </dd>
</dl> </dl>
@@ -83,13 +83,13 @@
</div> </div>
<h2>Summary</h2> <h2>Summary</h2>
Class holds all parameters for the java_cd module. Class holds all parameters for the confdroid_java module.
<h2>Overview</h2> <h2>Overview</h2>
<div class="docstring"> <div class="docstring">
<div class="discussion"> <div class="discussion">
<p>java_cd::params.pp Module name: java_cd Author: Arne Teuke (arne_teuke@confdroid.com)</p> <p>confdroid_java::params.pp Module name: confdroid_java Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div> </div>
</div> </div>
@@ -102,7 +102,7 @@
<li> <li>
<span class='name'>reqpackages</span> <span class='name'>js_reqpackages</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
@@ -120,13 +120,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;
@@ -160,14 +160,14 @@
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 8</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 8</span>
class java_cd::params ( class confdroid_java::params (
String $reqpackages = &#39;java-21-openjdk.x86_64&#39;, String $js_reqpackages = &#39;java-21-openjdk.x86_64&#39;,
String $pkg_ensure = &#39;latest&#39;, String $js_pkg_ensure = &#39;present&#39;,
) { ) {
# includes must be last # includes must be last
include java_cd::main::config include confdroid_java::main::config
}</pre> }</pre>
</td> </td>
</tr> </tr>

12
manifests/init.pp
View File

@@ -1,8 +1,8 @@
## java_cd::init.pp ## confdroid_java::init.pp
# Module name: java_cd # Module name: confdroid_java
# Author: Arne Teuke (arne_teuke@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class initializes the java_cd module. # @summary Class initializes the confdroid_java module.
############################################################################## ##############################################################################
class java_cd { class confdroid_java {
include java_cd::params include confdroid_java::params
} }

14
manifests/main/config.pp
View File

@@ -1,10 +1,10 @@
## java_cd::main::config.pp ## confdroid_java::main::config.pp
# Module name: java_cd # Module name: confdroid_java
# Author: Arne Teuke (arne_teuke@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages the logic for the java_cd module. # @summary Class manages the logic for the confdroid_java module.
############################################################################## ##############################################################################
class java_cd::main::config ( class confdroid_java::main::config (
) inherits java_cd::params { ) inherits confdroid_java::params {
include java_cd::main::install include confdroid_java::main::install
} }

16
manifests/main/install.pp
View File

@@ -1,12 +1,12 @@
## java_cd::main::install.pp ## confdroid_java::main::install.pp
# Module name: java_cd # Module name: confdroid_java
# Author: Arne Teuke (arne_teuke@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages the logic for the java_cd module. # @summary Class manages the logic for the confdroid_java module.
############################################################################## ##############################################################################
class java_cd::main::install ( class confdroid_java::main::install (
) inherits java_cd::params { ) inherits confdroid_java::params {
package { $reqpackages: package { $js_reqpackages:
ensure => $pkg_ensure, ensure => $js_pkg_ensure,
} }
} }

20
manifests/params.pp
View File

@@ -1,16 +1,16 @@
## java_cd::params.pp ## confdroid_java::params.pp
# Module name: java_cd # Module name: confdroid_java
# Author: Arne Teuke (arne_teuke@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class holds all parameters for the java_cd module. # @summary Class holds all parameters for the confdroid_java module.
# @param [String] reqpackages which packages to install # @param [String] js_reqpackages which packages to install
# @param [String] pkg_ensure which packages to install # @param [String] js_pkg_ensure which packages to install
############################################################################## ##############################################################################
class java_cd::params ( class confdroid_java::params (
String $reqpackages = 'java-21-openjdk.x86_64', String $js_reqpackages = 'java-21-openjdk.x86_64',
String $pkg_ensure = 'latest', String $js_pkg_ensure = 'present',
) { ) {
# includes must be last # includes must be last
include java_cd::main::config include confdroid_java::main::config
} }