X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=0b1af4b8d35a108628684bd79807f42ece17dfbd;hb=3b0287c48ed0e419292fd4bb3205e4274b469a6b;hp=76a21993cefe03f48e81ee1521931d722793a591;hpb=52c5719778ef59be012da71b2f996d28954bf701;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 76a21993c..0b1af4b8d 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -10,6 +10,13 @@ class exim {
           mode    => 755,
           purge   => true
         ;
+        "/etc/exim4/ssl":
+          ensure  => directory,
+          owner   => root,
+          group   => Debian-exim,
+          mode    => 750,
+          purge   => true
+        ;
         "/etc/exim4/exim4.conf":
           source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
                        "puppet:///exim/common/exim4.conf" ],
@@ -85,6 +92,34 @@ class exim {
           require => Package["exim4-daemon-heavy"],
           content => template("exim-local-auto.erb")
           ;
+        "/etc/exim4/ssl/thishost.crt":
+          require => Package["exim4-daemon-heavy"],
+          source  => "puppet:///exim/certs/$fqdn.crt",
+          owner   => root,
+          group   => Debian-exim,
+          mode    => 640
+          ;
+        "/etc/exim4/ssl/thishost.key":
+          require => Package["exim4-daemon-heavy"],
+          source  => "puppet:///exim/certs/$fqdn.key",
+          owner   => root,
+          group   => Debian-exim,
+          mode    => 640
+          ;
+        "/etc/exim4/ssl/ca.crt":
+          require => Package["exim4-daemon-heavy"],
+          source  => "puppet:///exim/certs/ca.crt",
+          owner   => root,
+          group   => Debian-exim,
+          mode    => 640
+          ;
+        "/etc/exim4/ssl/ca.crl":
+          require => Package["exim4-daemon-heavy"],
+          source  => "puppet:///exim/certs/ca.crl",
+          owner   => root,
+          group   => Debian-exim,
+          mode    => 640
+          ;
     }
 
     exec { "exim4 reload":
@@ -94,29 +129,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
 }