diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 71844f7..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,126 +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('puppet parser') { - steps { - sh '''for file in $(find . -iname \'*.pp\'); do - /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; - done;''' - } - } - - stage('check templates') { - steps{ - sh '''for file in $(find . -iname \'*.erb\'); - do erb -P -x -T "-" $file | ruby -c || exit 1; - done;''' - } - } - - stage('puppet-lint') { - steps { - sh '''/usr/local/bin/puppet-lint . \\ - --no-variable_scope-check \\ - || { echo "Puppet lint failed"; exit 1; } - ''' - } - } - - stage('SonarScan') { - steps { - withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { - sh ''' - /opt/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=confdroid_apache \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://sonarqube.confdroid.com \ - -Dsonar.token=$SONAR_TOKEN - ''' - } - } - } - - stage('create Puppet documentation') { - steps { - sh '/opt/puppetlabs/bin/puppet strings' - } - } - - 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 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 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/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/doc/puppet_classes/confdroid_apache_3A_3Aparams.html b/doc/puppet_classes/confdroid_apache_3A_3Aparams.html index edeb630..a18b49e 100644 --- a/doc/puppet_classes/confdroid_apache_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_apache_3A_3Aparams.html @@ -377,6 +377,24 @@ inherited by all classes except defines. —

the IP addresses of the internal proxies, i.e. the internal load balancers. This is required when ae_use_lb is set to true, and defaults to [‘127.0.0.1’].

+
+ + + +
  • + + ae_remoteip_header + + + (String) + + + (defaults to: 'X-Forwarded-For') + + + — +
    +

    the header to use for the remote ip, typically X-Forwarded-For. This is required when ae_use_lb is set to true, and defaults to X-Forwarded-For.

  • @@ -392,9 +410,6 @@ inherited by all classes except defines.
     
     
    -40
    -41
    -42
     43
     44
     45
    @@ -462,10 +477,14 @@ inherited by all classes except defines.
     107
     108
     109
    -110
    +110 +111 +112 +113 +114 -
    # File 'manifests/params.pp', line 40
    +        
    # File 'manifests/params.pp', line 43
     
     class confdroid_apache::params (
     
    @@ -493,6 +512,7 @@ class confdroid_apache::params (
       Boolean $ae_use_lb          = false,
       Array $ae_trusted_proxy     = ['127.0.0.1','10.0.1.0/24'],
       Array $ae_internal_proxy    = ['127.0.0.1','10.0.1.0/24'],
    +  String $ae_remoteip_header   = 'X-Forwarded-For',
     
     ) {
     # facts