From: Stephen Gran <steve@lobefin.net>
Date: Sat, 4 Apr 2009 22:45:49 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=fc98b488ba8e7c514e32ae8fb0992b9889692549;hp=a3c1645bfcb2851e2ed674aa8d932d03a0f0e4ef

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 d5c679ac..2233da94 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,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":