From 120045339f8c08d97b45a71a3f1b5840700ff4dc Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Fri, 20 Mar 2009 21:50:37 +0000
Subject: [PATCH] Break eximmx class up into clamav and postgrey classes.  We
 can still use the eximmx class as is, but we can also include the other
 classes directly on machines where for some reason we want more granular
 installs. Signed-off-by: Stephen Gran <steve@lobefin.net>

---
 modules/clamav/manifests/init.pp   | 30 ++++++++++++++++++++++++++++++
 modules/exim/manifests/init.pp     | 27 ++-------------------------
 modules/postgrey/manifests/init.pp | 16 ++++++++++++++++
 3 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 modules/clamav/manifests/init.pp
 create mode 100644 modules/postgrey/manifests/init.pp

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
new file mode 100644
index 000000000..d8c35a3ba
--- /dev/null
+++ b/modules/clamav/manifests/init.pp
@@ -0,0 +1,30 @@
+class clamav {
+    package { "clamav-daemon": ensure => latest;
+              "clamav-freshclam": ensure => latest;
+    }
+
+    file {
+        "/etc/clamav/clamd.conf":
+          source  => "puppet:///clamav/clamd.conf",
+          require => Package["clamav-daemon"],
+          notify  => Exec["clamav-daemon restart"]
+          ;
+    }
+
+    file {
+        "/etc/clamav/freshclam.conf":
+          source  => "puppet:///clamav/freshclam.conf",
+          require => Package["clamav-freshclam"],
+          notify  => Exec["clamav-freshclam restart"]
+          ;
+    }
+    exec { "clamav-daemon restart":
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+        refreshonly => true,
+    }
+    exec { "clamav-freshclam restart":
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+        refreshonly => true,
+    }
+}
+
diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 76a21993c..0aa2e0033 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -94,29 +94,6 @@ class exim {
 }
 
 class eximmx inherits exim {
-    package { "clamav-daemon": ensure => latest;
-              "postgrey": ensure => installed;
-    }
-
-    file {
-        "/etc/default/postgrey":
-          source  => "puppet:///exim/common/postgrey-default",
-          require => Package["postgrey"],
-          notify  => Exec["postgrey restart"]
-          ;
-        "/etc/clamav/clamd.conf":
-          source  => "puppet:///exim/common/clamd.conf",
-          require => Package["clamav-daemon"],
-          notify  => Exec["clamav-daemon restart"]
-          ;
-    }
-
-    exec { "clamav-daemon restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    exec { "postgrey restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+    include clamav;
+    include postgrey;
 }
diff --git a/modules/postgrey/manifests/init.pp b/modules/postgrey/manifests/init.pp
new file mode 100644
index 000000000..fd735b96c
--- /dev/null
+++ b/modules/postgrey/manifests/init.pp
@@ -0,0 +1,16 @@
+class postgrey {
+    package { "postgrey": ensure => installed; }
+
+    file {
+        "/etc/default/postgrey":
+          source  => "puppet:///exim/common/postgrey-default",
+          require => Package["postgrey"],
+          notify  => Exec["postgrey restart"]
+          ;
+    }
+
+    exec { "postgrey restart":
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+        refreshonly => true,
+    }
+}
-- 
2.20.1