From 33195f607c9d02b4e6cebaf8cab78f980a7b8bb9 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 15 Mar 2026 17:00:32 +0100 Subject: [PATCH] Recommit for updates in build 54 --- Jenkinsfile | 124 ------------------ .../confdroid_nrpe_3A_3Amain_3A_3Afiles.html | 18 +-- .../confdroid_nrpe_3A_3Aparams.html | 28 +--- 3 files changed, 13 insertions(+), 157 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 17655d3..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,124 +0,0 @@ -pipeline { - agent any - - 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_nrpe \ - -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_nrpe.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_nrpe_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Afiles.html index 48722bd..fafa7a0 100644 --- a/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/confdroid_nrpe_3A_3Amain_3A_3Afiles.html @@ -282,9 +282,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_cert_file: ensure => file, path => $ne_ssl_cert_file, - owner => 'root', - group => 'root', - mode => '0644', + owner => $ne_user, + group => $ne_user, + mode => '0440', selrange => s0, selrole => object_r, seltype => cert_t, @@ -294,9 +294,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_privatekey_file: ensure => file, path => $ne_ssl_privatekey_file, - owner => 'root', - group => 'root', - mode => '0600', + owner => $ne_user, + group => $ne_user, + mode => '0400', selrange => s0, selrole => object_r, seltype => cert_t, @@ -306,9 +306,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_ca_cert_file: ensure => file, path => $ne_ssl_ca_cert_file, - owner => 'root', - group => 'root', - mode => '0644', + owner => $ne_user, + group => $ne_user, + mode => '0440', selrange => s0, selrole => object_r, seltype => cert_t, diff --git a/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html b/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html index 1e62e65..68888ec 100644 --- a/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nrpe_3A_3Aparams.html @@ -349,24 +349,6 @@ inherited by all classes except defines. -
  • - - ne_ssl_version - - - (String) - - - (defaults to: 'TLSv2+') - - - — -
    -

    These directives allow you to specify how to use SSL/TLS.

    -
    - -
    • -
  • ne_ssl_cipher_list @@ -781,6 +763,8 @@ inherited by all classes except defines. 
     
 
+82
+83
 84
 85
 86
@@ -871,13 +855,10 @@ inherited by all classes except defines.
 171
 172
 173
-174
-175
-176
-177
    +174 - 
    # File 'manifests/params.pp', line 84
+        
    # File 'manifests/params.pp', line 82
 
 class confdroid_nrpe::params (
 
@@ -909,7 +890,6 @@ class confdroid_nrpe::params (
   String $ne_connection_timeout           = '300',
   String $ne_allow_weak_rnd_seed          = '1',
   Boolean $ne_enable_ssl                  = false,
-  String $ne_ssl_version                  = 'TLSv2+',
   String $ne_ssl_cipher_list              = 'ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH',
   String $ne_ssl_client_certs             = '0',
   String $ne_ssl_logging                  = '0x00',