Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index d5c679ac2bb99978f5dae4587f1bf336e0f3d15f..2233da945c951ddca165bdf3e0201105fc422773 100644 (file)
--- 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,20 @@ 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,
+          ;
     }
 
     exec { "exim4 reload":