From ce83e4bbab6829bc19ff19dcd19ad304d6d36f2f Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 22 Sep 2026 12:46:07 +0200 Subject: [PATCH] Recommit for updates in build 4 --- .vscode/settings.json | 57 -------- Jenkinsfile | 128 ------------------ doc/file.README.html | 5 +- doc/index.html | 5 +- ...nfdroid_clamav_3A_3Amain_3A_3Ainstall.html | 4 +- .../confdroid_clamav_3A_3Aparams.html | 34 ++++- 6 files changed, 33 insertions(+), 200 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 Jenkinsfile diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 43d2b81..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "cSpell.words": [ - "ALLMATCHSCAN", - "authenticode", - "behaviour", - "bofh", - "clamav", - "clamd", - "clamdscan", - "clamonacc", - "clamscan", - "Clamuko", - "clamupdate", - "Dazuko", - "dbname", - "epel", - "excludepaths", - "fanotify", - "filesize", - "freshclam", - "getsebool", - "INADDR", - "kubelet", - "libclamav", - "logclean", - "logfacility", - "logfile", - "logfilemaxsize", - "logfileunlock", - "logrotation", - "logsyslog", - "logtime", - "logverbose", - "mypass", - "myproxy", - "myusername", - "NOFILE", - "normalisation", - "PCRE", - "preludeanalyzername", - "preludeenable", - "recieve", - "RLIMIT", - "safebrowsing", - "setsebool", - "subsig", - "subsigs", - "tcpaddre", - "tcpaddress", - "tcpsocket", - "VIRUSEVENT", - "virusgroup", - "VIRUSNAME", - "XMLDOCS", - "xxxyyzzzz" - ] -} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3de3324..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,128 +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_clamav \ - -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 { - 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_clamav.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/file.README.html b/doc/file.README.html index 5542971..4a3cfd7 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -71,9 +71,8 @@

Features

  • Dependencies

    -

  • Parameters

  • @@ -118,7 +117,7 @@

    confdroid_resources for managing yum repo resources.

    • -

    Deployment

    +

    Deployment

    diff --git a/doc/index.html b/doc/index.html index 2ca2ceb..444e7f3 100644 --- a/doc/index.html +++ b/doc/index.html @@ -71,9 +71,8 @@

    Features

  • Dependencies

    -

  • Parameters

  • @@ -118,7 +117,7 @@

    confdroid_resources for managing yum repo resources.

    • -

    Deployment

    +

    Deployment

    diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html index e660374..3bae371 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html @@ -120,8 +120,8 @@ class confdroid_clamav::main::install ( ) inherits confdroid_clamav::params { require confdroid_resources::main::epel - package { $reqpackages: - ensure => $pkg_ensure, + package { $cv_reqpackages: + ensure => $cv_pkg_ensure, } } diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html index f8d4b7a..a6f9a88 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html @@ -109,7 +109,7 @@ inherited by all classes except defines.
  • - reqpackages + cv_reqpackages (Array) @@ -127,7 +127,7 @@ inherited by all classes except defines.
  • - pkg_ensure + cv_pkg_ensure (String) @@ -517,6 +517,24 @@ inherited by all classes except defines. —

    whether to enable the clamd service

    +
    + +
    • + +
  • + + cv_use_excludepaths + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to use advanced exclude paths

    • @@ -532,7 +550,6 @@ inherited by all classes except defines. 
     
 
-39
 40
 41
 42
@@ -582,16 +599,18 @@ inherited by all classes except defines.
 86
 87
 88
-89
    +89 +90 +91 - 
    # File 'manifests/params.pp', line 39
+        
    # File 'manifests/params.pp', line 40
 
 class confdroid_clamav::params (
 
 # installation
-  Array $reqpackages              = ['clamav','clamd','s-nail'],
-  String $pkg_ensure              = 'present',
+  Array $cv_reqpackages              = ['clamav','clamd','s-nail'],
+  String $cv_pkg_ensure              = 'present',
 
 # clamd
   String $cv_logfile              = '/var/log/clamd.scan',
@@ -615,6 +634,7 @@ class confdroid_clamav::params (
   String $cv_alert_file           = 'tmp/clamav-alert.txt',
   Boolean $cv_enable_freshclam    = true,
   Boolean $cv_enable_clamd        = true,
+  Boolean $cv_use_excludepaths    = true
 
 ) {
   # service