diff --git a/.gitignore b/.gitignore index a356406..cfae693 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Gemfile.lock FileList .scannerwork +.vscode \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index c0c890b..aa3e775 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=cd_apache \ + -Dsonar.projectKey=cconfdroid_apache \ -Dsonar.sources=. \ -Dsonar.host.url=https://sonarqube.confdroid.com \ -Dsonar.token=$SONAR_TOKEN @@ -90,16 +90,37 @@ 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 { + 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/confdroid_apache.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 1c76b6e..7ce5b77 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,27 @@ # README -[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/) +[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_apache)](https://jenkins.confdroid.com/job/confdroid_apache/) + +- [README](#readme) + - [Synopsis](#synopsis) + - [WARNING](#warning) + - [Features](#features) + - [vHosts](#vhosts) + - [Dependencies](#dependencies) + - [Deployment](#deployment) + - [Parameters](#parameters) + - [SELINUX](#selinux) + - [Support](#support) + - [Tests](#tests) + - [Contact Us](#contact-us) + - [Disclaimer](#disclaimer) -[[_TOC_]] ## Synopsis `Apache httpd` is a very powerful and widely used web server. -`cd_apache` automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress. +`confdroid_apache` automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress. ## WARNING @@ -43,7 +56,7 @@ As stated in the synopsis, this module was written particularly for usage as bas * WordPress * Nagios etc. -With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of `cd_apache` to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add `cd_apache` as requirement (i.e. require cd_apache) so it gets installed automatically. +With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of `confdroid_apache` to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add `confdroid_apache` as requirement (i.e. require confdroid_apache) so it gets installed automatically. ### Dependencies @@ -59,13 +72,13 @@ via site.pp or nodes.pp ```bash node 'example.example.net' { - include cd_apache + include confdroid_apache } ``` * through Foreman: -In order to apply parameters through Foreman, **__cd_apache::params__** must be added to the host or host group in question. +In order to apply parameters through Foreman, **__confdroid_apache::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/). diff --git a/doc/_index.html b/doc/_index.html index aaa4418..0abcf4a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -69,52 +69,52 @@ -

With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of cd_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add cd_apache as requirement (i.e. require cd_apache) so it gets installed automatically.

+

With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of confdroid_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add confdroid_apache as requirement (i.e. require confdroid_apache) so it gets installed automatically.

Dependencies

@@ -133,14 +133,14 @@

via site.pp or nodes.pp

node 'example.example.net' {
-  include cd_apache
+  include confdroid_apache
 }
-

In order to apply parameters through Foreman, cd_apache::params must be added to the host or host group in question.

+

In order to apply parameters through Foreman, confdroid_apache::params must be added to the host or host group in question.

See more details about class deployment on Confdroid.com.

diff --git a/doc/index.html b/doc/index.html index 6e5a6ea..ba198ad 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@

README

-

+

[[TOC]]

@@ -68,7 +68,7 @@

Apache httpd is a very powerful and widely used web server.

-

cd_apache automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.

+

confdroid_apache automates the installation and configuration of httpd. This module is a base module simply providing the httpd service itself to be used by other role- or profile modules, adding more detailed configurations specific to the particular use case, like for instance Wordpress.

WARNING

@@ -116,7 +116,7 @@

Nagios etc.

-

With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of cd_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add cd_apache as requirement (i.e. require cd_apache) so it gets installed automatically.

+

With those use cases, you would provide the vHosts at the Puppet module for the application, not the base module. Also, if you plan to use this module to run a plain fully fledged web server, you would use a role- or profile class/module on top of confdroid_apache to set up your vHost exactly as needed. Examples for regular basic vHost configuration files are included in the examples directory as parameterized .erb files. You would create a define for vHosts, i.e. using the example parameters, and simply add confdroid_apache as requirement (i.e. require confdroid_apache) so it gets installed automatically.

Dependencies

@@ -133,14 +133,14 @@

via site.pp or nodes.pp

node 'example.example.net' {
-  include cd_apache
+  include confdroid_apache
 }
-

In order to apply parameters through Foreman, cd_apache::params must be added to the host or host group in question.

+

In order to apply parameters through Foreman, confdroid_apache::params must be added to the host or host group in question.

See more details about class deployment on Confdroid.com.

diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 9fbcafd..7ff974e 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -36,72 +36,72 @@