diff --git a/.puppet-lint.rc b/.puppet-lint.rc
new file mode 100644
index 0000000..24728eb
--- /dev/null
+++ b/.puppet-lint.rc
@@ -0,0 +1,2 @@
+--no-variable_scope-check
+--no-top_scope_facts
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 6f7af1a..5498b66 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,7 +69,7 @@ pipeline {
withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
sh '''
/opt/sonar-scanner/bin/sonar-scanner \
- -Dsonar.projectKey=haproxy_cd \
+ -Dsonar.projectKey=confdroid_haproxy \
-Dsonar.sources=. \
-Dsonar.host.url=https://sonarqube.confdroid.com \
-Dsonar.token=$SONAR_TOKEN
@@ -90,16 +90,36 @@ pipeline {
sh '''
git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com
+ git rm -r --cached .vscode || echo "No .vscode to remove from git"
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
+ 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/confdroid_haproxy.git
+ git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
+ push master --mirror
+ '''
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/README.md b/README.md
index 2299b7e..01c1d4b 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,27 @@
# Readme
-[](https://jenkins.confdroid.com/job/haproxy_cd/)|
+[](https://jenkins.confdroid.com/job/confdroid_haproxy/)
-[[_TOC_]]
+- [Readme](#readme)
+ - [Synopsis](#synopsis)
+ - [WARNING](#warning)
+ - [Features](#features)
+ - [Dependencies](#dependencies)
+ - [Deployment](#deployment)
+ - [Parameters](#parameters)
+ - [Proxy Configuration](#proxy-configuration)
+ - [SELINUX](#selinux)
+ - [Known Problems](#known-problems)
+ - [Support](#support)
+ - [Tests](#tests)
+ - [Contact Us](#contact-us)
+ - [Disclaimer](#disclaimer)
## Synopsis
`HA Proxy` is a very powerful and popular open source load balancer to balance incoming requests between multiple instances of web-, application- or database servers etc.
-`haproxy_cd` automates installation and configuration of `HA proxy` including self-healing, monitoring and firewall etc.
+`confdroid_haproxy` automates installation and configuration of `HA proxy` including self-healing, monitoring and firewall etc.
## WARNING
@@ -18,46 +31,46 @@
INSTALLATION
-* install rpm binaries
+- install rpm binaries
CONFIGURATION
-* manage haproxy user
-* manage directories (file system permissions, selinux context)
-* manage files (file system permissions, content, selinux context)
-* manage proxy instances through a define
- * front-end options
- * back-end options
- * ACL options
-* manage fail2ban integration (optional, requires fail2ban_cd module)
+- manage haproxy user
+- manage directories (file system permissions, selinux context)
+- manage files (file system permissions, content, selinux context)
+- manage proxy instances through a define
+ - front-end options
+ - back-end options
+ - ACL options
+- manage fail2ban integration (optional, requires fail2ban_cd module)
SERVICE
-* manage haproxy service
-* restart service after changes in the configuration
+- manage haproxy service
+- restart service after changes in the configuration
## Dependencies
All dependencies must be included in the catalogue.
-* [cd_resources](https://gitlab.confdroid.com/puppet/cd_resources) for managing yum base repos
-* [concat](https://github.com/puppetlabs/puppetlabs-concat) for managing file fragments
+- [cd_resources](https://gitlab.confdroid.com/puppet/cd_resources) for managing yum base repos
+- [concat](https://github.com/puppetlabs/puppetlabs-concat) for managing file fragments
## Deployment
-* native Puppet deployment
+- native Puppet deployment
via site.pp or nodes.pp
```bash
node 'example.example.net' {
- include haproxy_cd
+ include confdroid_haproxy
}
```
-* through Foreman:
+- through Foreman:
-In order to apply parameters through Foreman, **__haproxy_cd::params__** must be added to the host or host group in question.
+In order to apply parameters through Foreman, **confdroid_haproxy::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/).
@@ -71,7 +84,7 @@ The proxy instances are configured in /etc/haproxy/haproxy.cfg, which is concate
In order to create proxy instances, you will need an external class, which addresses the define, like so:
```bash
- haproxy_cd::server::proxy { 'testing':
+ confdroid_haproxy::server::proxy { 'testing':
haproxy_fqdn => 'node.example.net',
frontend_name => 'test01-frontend',
frontend_mode => 'http',
@@ -82,7 +95,7 @@ In order to create proxy instances, you will need an external class, which addre
```
This allows the puppet module to create the sections in the configuration file as required. The haproxy service will be restarted after the changes in the configuration file are made.
-`haproxy_fqdn` **__must__** contain the fqdn of the haproxy **__server__** where this should be configured, otherwise the templates are not being populated.
+`haproxy_fqdn` **must**- contain the fqdn of the haproxy **server**- where this should be configured, otherwise the templates are not being populated.
Multiple ACLs need to be added as array, and will create one line each.
## SELINUX
@@ -93,22 +106,22 @@ All files and directories are configured with correct selinux context. If selinu
## Support
-* OS: Rocky 9
-* Puppet 8
+- OS: Rocky 9
+- Puppet 8
## Tests
-* Puppet Lint
- * 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.
-* Puppet Parser
-* ERB Template Parser
-* Sonar Quality Gate
+- Puppet Lint
+ - 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.
+- Puppet Parser
+- ERB Template Parser
+- Sonar Quality Gate
## Contact Us
-[contact Us](https://confdroid.com/contact/)
-[Feedback Portal](https://feedback.confdroid.com/)
+- [contact Us](https://confdroid.com/contact/)
+- [Feedback Portal](https://feedback.confdroid.com/)
## Disclaimer
diff --git a/doc/_index.html b/doc/_index.html
deleted file mode 100644
index e2689b0..0000000
--- a/doc/_index.html
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
-
-
- Documentation by YARD 0.9.36
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
HA Proxy is a very powerful and popular open source load balancer to balance incoming requests between multiple instances of web-, application- or database servers etc.
-
-
haproxy_cd automates installation and configuration of HA proxy including self-healing, monitoring and firewall etc.
-
-
WARNING
-
-
-
Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production
-
-
-
Features
-
-
INSTALLATION
-
-
install rpm binaries
-
-
-
CONFIGURATION
-
-
manage haproxy user
-
-
manage directories (file system permissions, selinux context)
-
-
manage files (file system permissions, content, selinux context)
The parameters are documented via puppet strings and listed here. Simply open in web browser.
-
-
Proxy Configuration
-
-
The proxy instances are configured in /etc/haproxy/haproxy.cfg, which is concatenated from various templates through a define in this puppet module. In order to create proxy instances, you will need an external class, which addresses the define, like so:
This allows the puppet module to create the sections in the configuration file as required. The haproxy service will be restarted after the changes in the configuration file are made. haproxy_fqdnmust contain the fqdn of the haproxy server where this should be configured, otherwise the templates are not being populated. Multiple ACLs need to be added as array, and will create one line each.
-
-
SELINUX
-
-
All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
-
-
Known Problems
-
-
Support
-
-
OS: Rocky 9
-
-
Puppet 8
-
-
-
Tests
-
-
Puppet Lint
-
-
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.
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.
HA Proxy is a very powerful and popular open source load balancer to balance incoming requests between multiple instances of web-, application- or database servers etc.
-
-
haproxy_cd automates installation and configuration of HA proxy including self-healing, monitoring and firewall etc.
-
-
WARNING
-
-
-
Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production
-
-
-
Features
-
-
INSTALLATION
-
-
install rpm binaries
-
-
-
CONFIGURATION
-
-
manage haproxy user
-
-
manage directories (file system permissions, selinux context)
-
-
manage files (file system permissions, content, selinux context)
The parameters are documented via puppet strings and listed here. Simply open in web browser.
-
-
Proxy Configuration
-
-
The proxy instances are configured in /etc/haproxy/haproxy.cfg, which is concatenated from various templates through a define in this puppet module. In order to create proxy instances, you will need an external class, which addresses the define, like so:
This allows the puppet module to create the sections in the configuration file as required. The haproxy service will be restarted after the changes in the configuration file are made. haproxy_fqdnmust contain the fqdn of the haproxy server where this should be configured, otherwise the templates are not being populated. Multiple ACLs need to be added as array, and will create one line each.
-
-
SELINUX
-
-
All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
-
-
Known Problems
-
-
Support
-
-
OS: Rocky 9
-
-
Puppet 8
-
-
-
Tests
-
-
Puppet Lint
-
-
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.
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.