Compare commits

...

18 Commits

Author SHA1 Message Date
Jenkins
e56fe3966c Merge branch 'jenkins-build-10' into 'master'
Auto-merge for build 10

See merge request puppet/confdroid_automatic!8
2026-04-30 11:52:32 +02:00
Jenkins Server
2c27a98db4 Recommit for updates in build 10 2026-03-31 15:52:51 +02:00
Jenkins Server
4d6eae4599 Merge remote-tracking branch 'origin/master' into jenkins-build-10 2026-03-31 15:52:51 +02:00
c4a63073f8 add deepwiki badge 2026-03-31 15:48:49 +02:00
Jenkins
c66e4db8fe Merge branch 'jenkins-build-8' into 'master'
Auto-merge for build 8

See merge request puppet/confdroid_automatic!7
2026-03-30 12:19:14 +00:00
Jenkins Server
354656bbb4 Recommit for updates in build 8 2026-03-30 14:19:07 +02:00
Jenkins Server
cabf393a0f Merge remote-tracking branch 'origin/master' into jenkins-build-8 2026-03-30 14:19:07 +02:00
cfd45de3d8 OP#547 update Readme 2026-03-30 14:18:06 +02:00
aae0f70464 OP#547 update Readme 2026-03-30 13:54:12 +02:00
Jenkins
10d06872c3 Merge branch 'jenkins-build-6' into 'master'
Auto-merge for build 6

See merge request puppet/confdroid_automatic!5
2026-03-30 11:51:02 +00:00
Jenkins Server
951daaf79e Recommit for updates in build 6 2026-03-30 13:50:52 +02:00
Jenkins Server
fdaafa1f8c Merge remote-tracking branch 'origin/master' into jenkins-build-6 2026-03-30 13:50:51 +02:00
9ff9365542 OP#547 update Readme 2026-03-30 13:49:38 +02:00
Jenkins
32266b8cfb Merge branch 'jenkins-build-5' into 'master'
Auto-merge for build 5

See merge request puppet/confdroid_automatic!4
2026-03-29 14:39:37 +00:00
Jenkins Server
983e6edb7e Recommit for updates in build 5 2026-03-29 16:39:32 +02:00
Jenkins Server
a0f0710b91 Merge remote-tracking branch 'origin/master' into jenkins-build-5 2026-03-29 16:39:32 +02:00
bb7ee6e887 OP#547 revert array to string 2026-03-29 16:38:22 +02:00
Jenkins
c49d211cf3 Merge branch 'jenkins-build-4' into 'master'
Auto-merge for build 4

See merge request puppet/confdroid_automatic!3
2026-03-29 14:30:32 +00:00
6 changed files with 96 additions and 210 deletions

134
Jenkinsfile vendored
View File

@@ -1,134 +0,0 @@
pipeline {
agent any
post {
always {
deleteDir() /* clean up our workspace */
}
success {
updateGitlabCommitStatus state: 'success'
}
failure {
updateGitlabCommitStatus state: 'failed'
step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true])
}
}
options {
gitLabConnection('gitlab.confdroid.com')
}
stages {
stage('pull master') {
steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''
git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
# Ensure we're on the development branch (triggered by push)
git checkout development
# Create jenkins branch from development
git checkout -b jenkins-build-$BUILD_NUMBER
# Optionally merge master into jenkins to ensure compatibility
git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
'''
}
}
}
stage('puppet parser') {
steps {
sh '''for file in $(find . -iname \'*.pp\'); do
/opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1;
done;'''
}
}
stage('check templates') {
steps{
sh '''for file in $(find . -iname \'*.erb\');
do erb -P -x -T "-" $file | ruby -c || exit 1;
done;'''
}
}
stage('puppet-lint') {
steps {
sh '''/usr/local/bin/puppet-lint . \\
--no-variable_scope-check \\
|| { echo "Puppet lint failed"; exit 1; }
'''
}
}
stage('SonarScan') {
steps {
withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
sh '''
/opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey=confdroid_automatic \
-Dsonar.sources=. \
-Dsonar.host.url=https://sonarqube.confdroid.com \
-Dsonar.token=$SONAR_TOKEN
'''
}
}
}
stage('create Puppet documentation') {
steps {
sh '/opt/puppetlabs/bin/puppet strings'
}
}
stage('update repo') {
steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''
git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
git rm -r --cached .scannerwork || echo "No .scannerwork to remove from git"
git rm -r --cached .yardoc || echo "No .yardoc to remove from git"
git rm -r --cached .vscode || echo "No .vscode to remove from git"
git commit --amend --no-edit --allow-empty
git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push -o merge_request.create \
-o merge_request.target=master \
-o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
-o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
-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 {
// Checkout from GitLab (already done implicitly)
sh '''
git checkout master
git pull origin master
git branch -D development
git branch -D jenkins-build-$BUILD_NUMBER
git rm -f Jenkinsfile
git rm -r --cached .scannerwork || echo "No .scannerwork to remove from git"
git rm -r --cached .yardoc || echo "No .yardoc to remove from git"
git rm -r --cached .vscode || echo "No .vscode to remove from git"
git commit --amend --no-edit --allow-empty
git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_automatic.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror
'''
}
}
}
}
}
}

View File

@@ -2,7 +2,7 @@
[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_automatic&style=plastic)](https://jenkins.confdroid.com/job/confdroid_automatic/)
[![Security Hotspots](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_automatic&metric=security_hotspots&token=sqb_c40a62afc3787918ade945dbc43089bb68ea7ab1)](https://sonarqube.confdroid.com/dashboard?id=confdroid_automatic)
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/grizzlycoda/puppet_collection)
- [Readme](#readme)
- [Synopsis](#synopsis)
- [WARNING](#warning)
@@ -10,16 +10,19 @@
- [Dependencies](#dependencies)
- [Support](#support)
- [Parameter Inheritance](#parameter-inheritance)
- [Module Deployment](#module-deployment)
- [SELINUX](#selinux)
- [Deployment](#deployment)
- [Tests](#tests)
- [Contact Us](#contact-us)
- [Disclaimer](#disclaimer)
## Synopsis
dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9.
dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9 and similar RHEL 9 based operating systems.
`confdroid_automatic` manages dnf-automatic installations and configurations.
`confdroid_automatic` manages dnf-automatic installations and configurations.
Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, that's all it needs.
## WARNING
@@ -27,8 +30,8 @@ dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9.
## Features
- install required binaries, files and services
- manage selinux context
- install required binaries,
- manage files and directories with proper selinux context
- manage main configurations files via parameters
- manage service
@@ -36,16 +39,34 @@ dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9.
## Support
- Rocky 9
- Rocky 9 (any RHEL 9-based OS should work)
- Puppet 8
## Parameter Inheritance
All parameters are listed in `params.pp` and inherited from there. Variable parameters are in the upper section and also documented in the top. These can be overridden by the ENC. Parameters in the bottom section (curly brackets) cannot be overridden and usually are used for keeping the code in the classes more readable.
## Module Deployment
## SELINUX
ALmost every puppet setup is done in very custom ways, and hence the way the modules are deployed to nodes are different. This module assumes [Foreman][def] as ENC, so the modules just have to be present on the master node and Foreman will take care for it.
All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
## Deployment
- native Puppet deployment
via site.pp or nodes.pp
```ruby
node 'example.example.net' {
include confdroid_automatic
}
```
- through Foreman:
In order to apply parameters through Foreman, **confdroid_automatic::params**- must be added to the host or host group in question.
See [more details about class deployment on confdroid.com](https://confdroid.com/2017/05/deploying-our-puppet-modules/).
## Tests
@@ -55,6 +76,7 @@ ALmost every puppet setup is done in very custom ways, and hence the way the mod
- Puppet Parser
- ERB Template Parser
- Sonar Quality Gate
- End-to-end deployments in Rocky-9 environments
## Contact Us
@@ -65,5 +87,3 @@ ALmost every puppet setup is done in very custom ways, and hence the way the mod
ConfDroid as entity is entirely independent from Puppet. We provide custom configuration modules, written for specific purposes and specific environments.
The modules are tested and supported only as documented, and require testing in designated environments (i.e. lab or development environments) for parameter tuning etc. before deploying into production environments.
[def]: https://www.theforeman.org/manuals/3.13/quickstart_guide.html

View File

@@ -60,37 +60,16 @@
<div id="content"><div id='filecontents'>
<h1 id="label-Readme">Readme</h1>
<p><a href="https://jenkins.confdroid.com/job/confdroid_automatic/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_automatic&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_automatic"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_automatic&amp;metric=security_hotspots&amp;token=sqb_c40a62afc3787918ade945dbc43089bb68ea7ab1"></a></p>
<ul><li>
<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="#dependencies">Dependencies</a></p>
</li><li>
<p><a href="#support">Support</a></p>
</li><li>
<p><a href="#parameter-inheritance">Parameter Inheritance</a></p>
</li><li>
<p><a href="#module-deployment">Module Deployment</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>
<p><a href="https://jenkins.confdroid.com/job/confdroid_automatic/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_automatic&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_automatic"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_automatic&amp;metric=security_hotspots&amp;token=sqb_c40a62afc3787918ade945dbc43089bb68ea7ab1"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a> - <a href="#readme">Readme</a> - <a href="#synopsis">Synopsis</a> - <a href="#warning">WARNING</a> - <a href="#features">Features</a> - <a href="#dependencies">Dependencies</a> - <a href="#support">Support</a> - <a href="#parameter-inheritance">Parameter Inheritance</a> - <a href="#selinux">SELINUX</a> - <a href="#deployment">Deployment</a> - <a href="#tests">Tests</a> - <a href="#contact-us">Contact Us</a> - <a href="#disclaimer">Disclaimer</a></p>
<h2 id="label-Synopsis">Synopsis</h2>
<p>dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9.</p>
<p>dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9 and similar RHEL 9 based operating systems.</p>
<p><code>confdroid_automatic</code> manages dnf-automatic installations and configurations.</p>
<p>Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, thats all it needs.</p>
<h2 id="label-WARNING">WARNING</h2>
<blockquote>
@@ -99,9 +78,9 @@
<h2 id="label-Features">Features</h2>
<ul><li>
<p>install required binaries, files and services</p>
<p>install required binaries,</p>
</li><li>
<p>manage selinux context</p>
<p>manage files and directories with proper selinux context</p>
</li><li>
<p>manage main configurations files via parameters</p>
</li><li>
@@ -112,7 +91,7 @@
<h2 id="label-Support">Support</h2>
<ul><li>
<p>Rocky 9</p>
<p>Rocky 9 (any RHEL 9-based OS should work)</p>
</li><li>
<p>Puppet 8</p>
</li></ul>
@@ -121,9 +100,28 @@
<p>All parameters are listed in <code>params.pp</code> and inherited from there. Variable parameters are in the upper section and also documented in the top. These can be overridden by the ENC. Parameters in the bottom section (curly brackets) cannot be overridden and usually are used for keeping the code in the classes more readable.</p>
<h2 id="label-Module+Deployment">Module Deployment</h2>
<h2 id="label-SELINUX">SELINUX</h2>
<p>ALmost every puppet setup is done in very custom ways, and hence the way the modules are deployed to nodes are different. This module assumes <a href="https://www.theforeman.org/manuals/3.13/quickstart_guide.html">Foreman</a> as ENC, so the modules just have to be present on the master node and Foreman will take care for it.</p>
<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.</p>
<h2 id="label-Deployment">Deployment</h2>
<ul><li>
<p>native Puppet deployment</p>
</li></ul>
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include confdroid_automatic
}
</code></pre>
<ul><li>
<p>through Foreman:</p>
</li></ul>
<p>In order to apply parameters through Foreman, <strong>confdroid_automatic::params</strong>- must be added to the host or host group in question.</p>
<p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on confdroid.com</a>.</p>
<h2 id="label-Tests">Tests</h2>
<ul><li>
@@ -139,6 +137,8 @@
<p>ERB Template Parser</p>
</li><li>
<p>Sonar Quality Gate</p>
</li><li>
<p>End-to-end deployments in Rocky-9 environments</p>
</li></ul>
<h2 id="label-Contact+Us">Contact Us</h2>

View File

@@ -60,37 +60,16 @@
<div id="content"><div id='filecontents'>
<h1 id="label-Readme">Readme</h1>
<p><a href="https://jenkins.confdroid.com/job/confdroid_automatic/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_automatic&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_automatic"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_automatic&amp;metric=security_hotspots&amp;token=sqb_c40a62afc3787918ade945dbc43089bb68ea7ab1"></a></p>
<ul><li>
<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="#dependencies">Dependencies</a></p>
</li><li>
<p><a href="#support">Support</a></p>
</li><li>
<p><a href="#parameter-inheritance">Parameter Inheritance</a></p>
</li><li>
<p><a href="#module-deployment">Module Deployment</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>
<p><a href="https://jenkins.confdroid.com/job/confdroid_automatic/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_automatic&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_automatic"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_automatic&amp;metric=security_hotspots&amp;token=sqb_c40a62afc3787918ade945dbc43089bb68ea7ab1"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a> - <a href="#readme">Readme</a> - <a href="#synopsis">Synopsis</a> - <a href="#warning">WARNING</a> - <a href="#features">Features</a> - <a href="#dependencies">Dependencies</a> - <a href="#support">Support</a> - <a href="#parameter-inheritance">Parameter Inheritance</a> - <a href="#selinux">SELINUX</a> - <a href="#deployment">Deployment</a> - <a href="#tests">Tests</a> - <a href="#contact-us">Contact Us</a> - <a href="#disclaimer">Disclaimer</a></p>
<h2 id="label-Synopsis">Synopsis</h2>
<p>dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9.</p>
<p>dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9 and similar RHEL 9 based operating systems.</p>
<p><code>confdroid_automatic</code> manages dnf-automatic installations and configurations.</p>
<p>Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, thats all it needs.</p>
<h2 id="label-WARNING">WARNING</h2>
<blockquote>
@@ -99,9 +78,9 @@
<h2 id="label-Features">Features</h2>
<ul><li>
<p>install required binaries, files and services</p>
<p>install required binaries,</p>
</li><li>
<p>manage selinux context</p>
<p>manage files and directories with proper selinux context</p>
</li><li>
<p>manage main configurations files via parameters</p>
</li><li>
@@ -112,7 +91,7 @@
<h2 id="label-Support">Support</h2>
<ul><li>
<p>Rocky 9</p>
<p>Rocky 9 (any RHEL 9-based OS should work)</p>
</li><li>
<p>Puppet 8</p>
</li></ul>
@@ -121,9 +100,28 @@
<p>All parameters are listed in <code>params.pp</code> and inherited from there. Variable parameters are in the upper section and also documented in the top. These can be overridden by the ENC. Parameters in the bottom section (curly brackets) cannot be overridden and usually are used for keeping the code in the classes more readable.</p>
<h2 id="label-Module+Deployment">Module Deployment</h2>
<h2 id="label-SELINUX">SELINUX</h2>
<p>ALmost every puppet setup is done in very custom ways, and hence the way the modules are deployed to nodes are different. This module assumes <a href="https://www.theforeman.org/manuals/3.13/quickstart_guide.html">Foreman</a> as ENC, so the modules just have to be present on the master node and Foreman will take care for it.</p>
<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.</p>
<h2 id="label-Deployment">Deployment</h2>
<ul><li>
<p>native Puppet deployment</p>
</li></ul>
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include confdroid_automatic
}
</code></pre>
<ul><li>
<p>through Foreman:</p>
</li></ul>
<p>In order to apply parameters through Foreman, <strong>confdroid_automatic::params</strong>- must be added to the host or host group in question.</p>
<p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on confdroid.com</a>.</p>
<h2 id="label-Tests">Tests</h2>
<ul><li>
@@ -139,6 +137,8 @@
<p>ERB Template Parser</p>
</li><li>
<p>Sonar Quality Gate</p>
</li><li>
<p>End-to-end deployments in Rocky-9 environments</p>
</li></ul>
<h2 id="label-Contact+Us">Contact Us</h2>

View File

@@ -273,10 +273,10 @@
<span class='name'>ac_email_to</span>
<span class='type'>(<tt>Array[String]</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;root@example.net&#39;,&#39;ops@example.net&#39;]</tt>)</em>
<em class="default">(defaults to: <tt>&#39;root@example.net&#39;</tt>)</em>
&mdash;
@@ -365,7 +365,7 @@ class confdroid_automatic::params (
String $ac_apply_updates = &#39;yes&#39;,
String $ac_reboot = &#39;never&#39;,
String $ac_emit_via = &#39;email&#39;,
Array[String] $ac_email_to = [&#39;root@example.net&#39;,&#39;ops@example.net&#39;],
String $ac_email_to = &#39;root@example.net&#39;,
String $ac_email_host = &#39;localhost&#39;,
) {

View File

@@ -12,7 +12,7 @@
# @param [String] ac_apply_updates whether to apply available updates
# @param [String] ac_reboot when to reboot after applied updates
# @param [String] ac_emit_via how to inform about emitted updates
# @param [Array[String]] ac_email_to where to send the email to
# @param [String] ac_email_to where to send the email to
# @param [String] ac_email_host which host to use to send the email
##############################################################################
class confdroid_automatic::params (
@@ -28,7 +28,7 @@ class confdroid_automatic::params (
String $ac_apply_updates = 'yes',
String $ac_reboot = 'never',
String $ac_emit_via = 'email',
Array[String] $ac_email_to = ['root@example.net','ops@example.net'],
String $ac_email_to = 'root@example.net',
String $ac_email_host = 'localhost',
) {