1
0

OP#784 add to puppet collection

This commit is contained in:
2026-09-23 10:55:35 +02:00
committed by Jenkins Server
parent cd016046d3
commit ce9522f6a8
2 changed files with 12 additions and 119 deletions

118
Jenkinsfile vendored
View File

@@ -1,118 +0,0 @@
pipeline {
agent {
label 'puppet'
}
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('SonarScan') {
steps {
withCredentials([string(credentialsId: 'sonar-token-12ww1160', variable: 'SONAR_TOKEN')]) {
sh '''
/opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey=puppet_collection \
-Dsonar.sources=. \
-Dsonar.host.url=https://sonarqube.confdroid.com \
-Dsonar.token=$SONAR_TOKEN
'''
}
}
}
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 add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push origin HEAD:master
'''
}
}
}
stage('Mirror to Gitea') {
steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
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 .vscode || echo "No .vscode to remove from git"
git commit --amend --no-edit --allow-empty
git remote add master https://sourcecode.confdroid.com/confdroid/puppet_collection.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror
'''
}
}
}
}
}
stage('Mirror to Github - Grizzlycoda') {
steps {
sshagent(['key-github-grizzlycoda']) {
sh '''
git remote add github-grizzly git@github.com:grizzlycoda/puppet_collection.git
git push github-grizzly --mirror
'''
}
}
}
stage('Mirror to Github - 12ww1160') {
steps {
sshagent(['key-github-12ww160-not-grizzly']) {
sh '''
git remote add github-12ww git@github.com:12ww1160/puppet_collection.git
git push github-12ww --mirror
'''
}
}
}
}
}

View File

@@ -23,6 +23,7 @@
- [confdroid\_java](#confdroid_java)
- [confdroid\_alloy](#confdroid_alloy)
- [confdroid\_haproxy](#confdroid_haproxy)
- [confdroid\_clamav](#confdroid_clamav)
- [FAQ](#faq)
## Summary
@@ -173,7 +174,6 @@ Install java binaries for usage with other modules, i.e. confdroid_jenkins, as s
- install alloy binaries
- install node exporter (optional, set `ay_manage_ne`to `true`)
- manage alloy directories and files including templates
- manage the main alloy pipeline for loki and prometheus
- manage log rotation for rsyslog to allow adm membership
@@ -195,6 +195,17 @@ install, configure and manage haproxy service configure proxies via define acces
- manage fail2ban integration (optional, requires confdroid_fail2ban module)
- manage haproxy service and stats service
### [confdroid_clamav](https://3for.me/xkozd)
install, configure and manage clamav / clamd
- install all required binaries including s-nail as mail program to send alerts when infected files are found
- manage required config files
- manage cronjob settings via parameters
- run cron job to scan the file system (by default starting at root, configurable) via clamdscan
- set ConcurrentDatabaseReload option `yes`/`no` to optimize RAM consumption. defaults to `no`
- manage `freshclam` and `clamd` services
---
## FAQ