diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 31d7fc0..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -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"
- ]
-}
\ 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/puppet_classes/confdroid_clamav_3A_3Aparams.html b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
index 62df361..55b5db5 100644
--- a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
@@ -553,6 +553,60 @@ inherited by all classes except defines.
—
whether to enable concurrent database reloads. This is useful when you have multiple clamd instances running on the same machine. If you have only one clamd instance, this should be set to ‘no’.
+
+
+
+
+
+
+ cv_clamd_max_mem
+
+
+ (String)
+
+
+ (defaults to: '512M')
+
+
+ —
+
+
maximum memory usage for clamd.
+
+
maximum CPU usage for clamd.
+
+
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.
-44
-45
-46
-47
-48
49
50
51
@@ -622,10 +671,18 @@ inherited by all classes except defines.
95
96
97
-98
+98
+99
+100
+101
+102
+103
+104
+105
+106
- # File 'manifests/params.pp', line 44
+ # File 'manifests/params.pp', line 49
class confdroid_clamav::params (
@@ -657,6 +714,9 @@ class confdroid_clamav::params (
Boolean $cv_enable_clamd = true,
Boolean $cv_use_excludepaths = true,
String $cv_concurrentdatabasereload = 'no',
+ String $cv_clamd_max_mem = '512M',
+ String $cv_clamd_cpu_quota = '30%',
+ String $cv_nice_value = '19'
) {
# service
|