diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 2c16b5b..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://gitea.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 0ff681d..76d1b2c 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ - [Summary](#summary) - [Overview](#overview) - [--confdroid\_puppet--](#--confdroid_puppet--) - - [--confdroid\_prometheus--](#--confdroid_prometheus--) - - [--confdroid\_postgresql--](#--confdroid_postgresql--) + - [confdroid\_prometheus](#confdroid_prometheus) + - [confdroid\_postgresql](#confdroid_postgresql) + - [confdroid\_apache](#confdroid_apache) - [FAQ](#faq) ## Summary @@ -37,7 +38,7 @@ A Puppet module to configure a puppet environment: - r10k deployment service - webhook listener to trigger r10k -### [--confdroid_prometheus--](https://gitea.confdroid.com/confdroid/confdroid_prometheus) +### [confdroid_prometheus](https://gitea.confdroid.com/confdroid/confdroid_prometheus) Configures Prometheus, a Time Series Collection and Processing server @@ -46,7 +47,7 @@ Configures Prometheus, a Time Series Collection and Processing server - optionally adds remote writing to a Postgresql database via postgresql Adapter ( not part of this module) - Optionally allows pruning of the local TSDB -### [--confdroid_postgresql--](https://gitea.confdroid.com/confdroid/confdroid_postgresql) +### [confdroid_postgresql](https://gitea.confdroid.com/confdroid/confdroid_postgresql) Automate installation, configuration and management of all aspects of PostgreSQL(standalone) @@ -57,6 +58,15 @@ Automate installation, configuration and management of all aspects of PostgreSQL - install and manage pg_bouncer (set `pl_use_pg_bouncer` to true) - enable SL / TLS manage TLS certificates (set `pl_ssl_enabled` to true and populate content externally through variables) +### [confdroid_apache](https://gitea.confdroid.com/confdroid/confdroid_apache) + +Install and configure a standalone empty Apache (httpd) server. The module is mainly to be used by other modules to add websites or services on top, i.e. Nagios, Wordpress etd. + +- install the packages +- manage main files and directories +- ensure the service is up and running +- open the firewall + ## FAQ - Q: "Why are the names of the modules using underscore instead of hyphens?"