diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f03c1e..ae314a8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "clamd", + "epel", "freshclam", "logclean", "logfacility", diff --git a/Jenkinsfile b/Jenkinsfile index 5047f3d..fe517fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,7 @@ pipeline { withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { sh ''' /opt/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=cd_clamav \ + -Dsonar.projectKey=clamav_cd \ -Dsonar.sources=. \ -Dsonar.host.url=https://sonarqube.confdroid.com \ -Dsonar.token=$SONAR_TOKEN @@ -91,7 +91,12 @@ pipeline { git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" - git push origin HEAD:master + git push -o merge_request.create \ + -o merge_request.target=master \ + -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \ + -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \ + -o merge_request.merge_when_pipeline_succeeds=true \ + origin jenkins-build-$BUILD_NUMBER ''' } } diff --git a/README.md b/README.md index d4f3a40..2317113 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Readme -[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_clamav)](https://jenkins.confdroid.com/job/cd_clamav/)| +[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=clamav_cd)](https://jenkins.confdroid.com/job/clamav_cd/)| [[_TOC_]] @@ -8,7 +8,7 @@ `Clamav` is a powerful antivirus scanner with several components. -`cd_clamav` is a puppet module to manage clamav installations and configurations. +`clamav_cd` is a puppet module to manage clamav installations and configurations. ## WARNING @@ -28,13 +28,13 @@ via site.pp or nodes.pp ```bash node 'example.example.net' { - include cd_clamav + include clamav_cd } ``` * through Foreman: -In order to apply parameters through Foreman, **__cd_clamav::params__** must be added to the host or host group in question. +In order to apply parameters through Foreman, **__clamav_cd::params__** must be added to the host or host group in question. See [more details about class deployment on Confdroid.com](https://confdroid.com/2017/05/deploying-our-puppet-modules/). @@ -48,20 +48,16 @@ All files and directories are configured with correct selinux context. If selinu ## Support -* OS: CentOS 7 -* Puppet 5 +* OS: Rocky 9 +* Puppet 6-8 ## Tests * Puppet Lint * excluded tests: * `--no-class_inherits_from_params_class-check`:relevant only to non-supported outdated puppet versions - * `--no-variable_scope-check`: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters. - * `--no-80chars-check`: it is not always possible to stay within 80 characters, although typically only occurring on the parameter vault `params.pp`. - * `--no-arrow_alignment-check`: this check leads to actually not having am easily readable arrow alignment, as this checks `per block`, not per class. * Puppet Parser * ERB Template Parser -* Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files) * Sonar Quality Gate ## Contact Us diff --git a/doc/_index.html b/doc/_index.html index d039182..dc4ce47 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -69,37 +69,37 @@ diff --git a/doc/index.html b/doc/index.html index da6b464..f203196 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@

Readme

-

|

+

|

[[TOC]]

@@ -68,7 +68,7 @@

Clamav is a powerful antivirus scanner with several components.

-

cd_clamav is a puppet module to manage clamav installations and configurations.

+

clamav_cd is a puppet module to manage clamav installations and configurations.

WARNING

@@ -89,14 +89,14 @@

via site.pp or nodes.pp

node 'example.example.net' {
-  include cd_clamav
+  include clamav_cd
 }
-

In order to apply parameters through Foreman, cd_clamav::params must be added to the host or host group in question.

+

In order to apply parameters through Foreman, clamav_cd::params must be added to the host or host group in question.

See more details about class deployment on Confdroid.com.

@@ -110,9 +110,9 @@

Support

Tests

@@ -122,20 +122,12 @@

excluded tests:

  • Puppet Parser

  • ERB Template Parser

  • -

    Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

    -

  • Sonar Quality Gate

    • diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 8b4dbae..f1ba29d 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -36,51 +36,51 @@