Merge remote-tracking branch 'origin/master' into jenkins-build-15

OP#785 switch MemoryLimit to MemoryMax
Recommit for updates in build 14
2026-09-22 14:32:02 +02:00 · 2026-09-22 14:30:56 +02:00 · 2026-09-22 14:10:46 +02:00
11 changed files with 42 additions and 200 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,62 +0,0 @@
-{
-    "cSpell.words": [
-        "ALLMATCHSCAN",
-        "authenticode",
-        "behaviour",
-        "bofh",
-        "clamav",
-        "clamd",
-        "clamdscan",
-        "clamonacc",
-        "clamscan",
-        "Clamuko",
-        "clamupdate",
-        "concurrentdatabasereload",
-        "Dazuko",
-        "dbname",
-        "epel",
-        "excludepaths",
-        "fanotify",
-        "fdpass",
-        "filesize",
-        "freshclam",
-        "getsebool",
-        "INADDR",
-        "kubelet",
-        "libclamav",
-        "logclean",
-        "logfacility",
-        "logfile",
-        "logfilemaxsize",
-        "logfileunlock",
-        "logrotation",
-        "logsyslog",
-        "logtime",
-        "logverbose",
-        "MAINPID",
-        "multiscan",
-        "mypass",
-        "myproxy",
-        "myusername",
-        "NOFILE",
-        "normalisation",
-        "PCRE",
-        "pipefail",
-        "preludeanalyzername",
-        "preludeenable",
-        "recieve",
-        "RLIMIT",
-        "safebrowsing",
-        "setsebool",
-        "subsig",
-        "subsigs",
-        "tcpaddre",
-        "tcpaddress",
-        "tcpsocket",
-        "VIRUSEVENT",
-        "virusgroup",
-        "VIRUSNAME",
-        "XMLDOCS",
-        "xxxyyzzzz"
-    ]
-}
--- a/128
+++ b/128
@@ -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
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -98,6 +98,11 @@
      
            </li>
    
+            <li>
+      <span class='object_link'><a href="puppet_classes/confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span>
+      
+            </li>
+    
      </ul>
    </ul>
  
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -78,6 +78,13 @@
    </li>
    

+    <li id="object_puppet_classes::confdroid_clamav::params" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span>
+      </div>
+    </li>
+    
+

      </ul>
    </div>
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html
@@ -64,7 +64,7 @@
  
  <dl>
    <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
  </dl>
  
  
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html
@@ -64,7 +64,7 @@
  
  <dl>
    <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
  </dl>
  
  
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
@@ -64,7 +64,7 @@
  
  <dl>
    <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
  </dl>
  
  
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html
@@ -64,7 +64,7 @@
  
  <dl>
    <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
  </dl>
  
  
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html
@@ -64,7 +64,7 @@
  
  <dl>
    <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
  </dl>
  
  
--- a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
@@ -607,6 +607,24 @@ inherited by all classes except defines.
        &mdash;
        <div class='inline'>
 <p>nice value for clamd. This is a number between -20 and 19. The lower the number, the higher the priority. The default is 19, which is the lowest priority.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cv_timeout_start_sec</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;420&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>timeout for starting the clamd service.</p>
 </div>
      
    </li>
@@ -622,7 +640,6 @@ inherited by all classes except defines.
        <pre class="lines">


-49
 50
 51
 52
@@ -679,10 +696,12 @@ inherited by all classes except defines.
 103
 104
 105
-106</pre>
+106
+107
+108</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 49</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 50</span>

 class confdroid_clamav::params (

@@ -716,7 +735,8 @@ class confdroid_clamav::params (
  String $cv_concurrentdatabasereload = &#39;no&#39;,
  String $cv_clamd_max_mem            = &#39;512M&#39;,
  String $cv_clamd_cpu_quota          = &#39;30%&#39;,
-  String $cv_nice_value               = &#39;19&#39;
+  String $cv_nice_value               = &#39;19&#39;,
+  String $cv_timeout_start_sec        = &#39;420&#39;

 ) {
  # service
--- a/templates/clamd_svc.erb
+++ b/templates/clamd_svc.erb
@@ -14,7 +14,7 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart = on-failure
 TimeoutStartSec=<%= @cv_timeout_start_sec %>
-MemoryLimit=<%= @cv_clamd_max_mem %>
+MemoryMax=<%= @cv_clamd_max_mem %>
 CPUQuota=<%= @cv_clamd_cpu_quota %>
 Nice=<%= @cv_nice_value %>
Author	SHA1	Message	Date
Jenkins Server	fbd3e5327d	Merge remote-tracking branch 'origin/master' into jenkins-build-15	2026-09-22 14:32:02 +02:00
12ww1160	dfb9601a5d	OP#785 switch MemoryLimit to MemoryMax	2026-09-22 14:30:56 +02:00
Jenkins Server	3e0ccc94d0	Recommit for updates in build 14	2026-09-22 14:10:46 +02:00