diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f2e7b..dfd6b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ Changelog of Git Changelog.

Unreleased

No issue

+96cb29bd1845c61 Jenkins ConfDroid 2019-12-26 16:26:48 +

+

recommit for updates in build 25

+ +

+795543319c34b3b Arne Teuke 2019-12-26 16:26:06 +

+

changes packages

+ +

3f2934b4a3e16c4 Jenkins ConfDroid 2019-12-26 16:03:26

recommit for updates in build 24

diff --git a/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Adirs.html index bcf22b6..67d262e 100644 --- a/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Adirs.html @@ -122,7 +122,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

26 27 28 -29 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41
# File 'manifests/main/dirs.pp', line 23
@@ -133,6 +145,18 @@ class cd_clamav::main::dirs (
 
   require cd_clamav::main::install
 
+  # config.d dir
+  file { $cv_config_d_dir:
+    ensure    =>  directory,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0755',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  etc_t,
+    seluser   =>  system_u,
+  }
+
 }
diff --git a/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Afiles.html index 5781e33..0ee1530 100644 --- a/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_clamav_3A_3Amain_3A_3Afiles.html @@ -123,7 +123,32 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

27 28 29 -30 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55
# File 'manifests/main/files.pp', line 23
@@ -134,7 +159,32 @@ class cd_clamav::main::files (
 
   require cd_clamav::main::dirs
 
+  # clamd config file
+  file { $cv_clamd_config_file:
+    ensure    =>  file,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0644',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  etc_t,
+    seluser   =>  system_u,
+    content   =>  template($cv_clamd_config_erb),
+#    notify    =>  Service[$cv_service],
+  }
 
+  # freshclam config file
+  file { $cv_freshclam_file:
+    ensure    =>  file,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0600',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  etc_t,
+    seluser   =>  system_u,
+    content   =>  template($cv_freshclam_erb),
+  }
 }
diff --git a/doc/puppet_classes/cd_clamav_3A_3Aparams.html b/doc/puppet_classes/cd_clamav_3A_3Aparams.html index fbcb5de..6ce8306 100644 --- a/doc/puppet_classes/cd_clamav_3A_3Aparams.html +++ b/doc/puppet_classes/cd_clamav_3A_3Aparams.html @@ -149,7 +149,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

(string) - (defaults to: 'latest') + (defaults to: 'present') — @@ -185,7 +185,16 @@ type to choose, i.e. latest or present.

40 41 42 -43 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52
# File 'manifests/params.pp', line 28
@@ -193,13 +202,22 @@ type to choose, i.e. latest or present.

class cd_clamav::params ( # installation -$reqpackages = ['clamav','clamav-update','clamd'], -$pkg_ensure = 'latest', +$reqpackages = ['clamav','clamav-update','clamd'], +$pkg_ensure = 'present', ) { -$cv_service = '' +# service +$cv_service = 'clamd@.service' +# dirs +$cv_config_d_dir = '/etc/clamd.d' + +# files +$cv_clamd_config_file = "${cv_config_d_dir}/scan.conf" +$cv_clamd_config_erb = 'cd_clamav/scan_conf.erb' +$cv_freshclam_file = '/etc/freshclam.conf' +$cv_freshclam_erb = 'cd_clamav/freshclam_conf.erb' # includes must be last