Drop duplicate definition

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 3913901..1d4a252 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -8,10 +8,10 @@ class exim {
           group   => root,
           mode    => 664,
           source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/exim4.conf" ]
+                       "puppet:///exim/common/exim4.conf" ],
           require => Package["exim4-heavy"],
-          notify  => Exec["exim4 reload"],
-
+          notify  => Exec["exim4 reload"]
+          ;
         "/etc/exim4/blacklist":
           owner   => root,
           group   => root,
@@ -19,7 +19,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/callout_users":
           owner   => root,
           group   => root,
@@ -27,15 +27,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
                        "puppet:///exim/common/" ]
-
-        "/etc/exim4/exim4.conf":
-          owner   => root,
-          group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/grey_users":
           owner   => root,
           group   => root,
@@ -43,7 +35,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/helo-check":
           owner   => root,
           group   => root,
@@ -51,7 +43,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/localusers":
           owner   => root,
           group   => root,
@@ -59,7 +51,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/localusers",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/rbllist":
           owner   => root,
           group   => root,
@@ -67,7 +59,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/rcpthosts":
           owner   => root,
           group   => root,
@@ -75,7 +67,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/rhsbllist":
           owner   => root,
           group   => root,
@@ -83,7 +75,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/virtualdomains":
           owner   => root,
           group   => root,
@@ -91,7 +83,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
                        "puppet:///exim/common/" ]
-
+          ;
         "/etc/exim4/whitelist":
           owner   => root,
           group   => root,
@@ -99,7 +91,7 @@ class exim {
           require => Package["exim4-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
                        "puppet:///exim/common/" ]
-
+          ;
     }
 
     exec { "exim4 reload":