local-settins.conf is gone away - use local.yaml instead

[dsa-puppet.git] / modules / exim / manifests / init.pp

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index f65c6a630009df20bed1b9547248e40d5bafef52..6861b44be47703356ff4b921e9965eabdad2cca5 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -15,6 +15,7 @@ class exim {
           owner   => root,
           group   => Debian-exim,
           mode    => 750,
+          require => Package["exim4-daemon-heavy"],
           purge   => true
         ;
         "/etc/mailname":
@@ -98,12 +99,6 @@ 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"),