From 803b4b021873c155975c9b3a773515288feda9b3 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Wed, 11 Mar 2026 13:01:02 +0100 Subject: [PATCH] add confdroid_fail2ban --- Jenkinsfile | 105 ---------------------------------------------------- README.md | 13 +++++++ 2 files changed, 13 insertions(+), 105 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index bf64a5b..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,105 +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 { - 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') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git remote set-url --push master git@github.com:grizzlycoda/puppet_collection.git - git push master --mirror - ''' - } - } - } - } -} diff --git a/README.md b/README.md index 16344a9..8dbfb39 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ - [confdroid\_php](#confdroid_php) - [confdroid\_nrpe](#confdroid_nrpe) - [confdroid\_nagios](#confdroid_nagios) + - [confdroid\_fail2ban](#confdroid_fail2ban) - [control repo template](#control-repo-template) - [FAQ](#faq) @@ -117,6 +118,18 @@ Install, configure and fully populate Nagios via Exports in PuppetDB - export client targets (hosts, services) - import resources in nagios (hosts, services, commands, contacts etc.) +### [confdroid_fail2ban](https://3for.me/fqqjy) + +Install, configure and manage fail2ban to protect hosts and services against brute force attacks. + +- manage directory structure (file system permissions, selinux context) +- manage configuration files (file system permissions, selinux context, content based on parameters) + - fail2ban.conf + - fail2ban.local (overrides default settings in fail2ban.conf) + - jail.conf + - jail.local (overrides default settings in jail.conf) +- manage service status + ### [control repo template](https://3for.me/nq00s) A template for starting a r10k control repo in a new puppet infrastructure