X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=3ad6a6e0651003ee0826ce5c1db024c96810e0c4;hb=ca99685913765f639b2092893b1ed18078c99b95;hp=260d3a9c92d73ad28c03868507df870d95999d89;hpb=f38bedbc5b95b4f533cb6a22cde87e439d952a7f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 260d3a9c9..3ad6a6e06 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -23,6 +23,11 @@ class exim {
           require => Package["exim4-daemon-heavy"],
           notify  => Exec["exim4 reload"]
           ;
+        "/etc/exim4/manualroute":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/manualroute",
+                       "puppet:///exim/common/manualroute" ]
+          ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
@@ -88,9 +93,16 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
                        "puppet:///exim/common/logrotate-exim4-paniclog" ]
           ;
+        "/etc/exim4/local-settings.conf":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/local-settings.conf",
+                       "puppet:///exim/common/local-settings.conf" ],
+          notify  => Exec["exim4 reload"]
+          ;
         "/etc/exim4/local-auto.conf":
           require => Package["exim4-daemon-heavy"],
-          content => template("exim-local-auto.erb")
+          content => template("exim-local-auto.erb"),
+          notify  => Exec["exim4 reload"]
           ;
         "/etc/exim4/ssl/thishost.crt":
           require => Package["exim4-daemon-heavy"],
@@ -106,6 +118,20 @@ class exim {
           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":