From: Stephen Gran <steve@lobefin.net>
Date: Sun, 15 Mar 2009 17:09:03 +0000 (+0000)
Subject: OK, I think it works now.  Go live.  what can possibly go wrong?
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=667af6550992e9454505aa27765ed3e20b0b2225;p=dsa-puppet.git

OK, I think it works now.  Go live.  what can possibly go wrong?
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index e810e05d..578da32c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,7 +24,3 @@ node default {
         default:   {}
     }
 }
-
-node master inherits default {
-    include exim-extended
-}
diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 1686b047..93ea0b62 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -81,6 +81,10 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
                        "puppet:///exim/common/logrotate-exim4-paniclog" ]
           ;
+        "/etc/exim4/local-auto.conf":
+          require => Package["exim4-daemon-heavy"],
+          content => template("exim-local-auto.erb")
+          ;
     }
 
     exec { "exim4 reload":
@@ -88,12 +92,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class exim-extended inherits exim {
-    file {
-        "/etc/exim4/test":
-          require => Package["exim4-daemon-heavy"],
-          content => template("exim-test.erb")
-          ;
-    }
-}
diff --git a/templates/exim-local-auto.erb b/templates/exim-local-auto.erb
new file mode 100644
index 00000000..94a571df
--- /dev/null
+++ b/templates/exim-local-auto.erb
@@ -0,0 +1,33 @@
+<% if has_variable?("clamd") && clamd == "true" -%>
+CLAMAV = clamd:/var/run/clamav/clamd.ctl
+<% else -%>
+# CLAMAV is undefined
+<% end -%>
+<% if has_variable?("postgrey") && postgrey == "true" -%>
+USE_GREYLISTING = 1
+# HAVE_GREYLIST is undefined
+HAVE_POSTGREY = 1
+<% elsif has_variable?("greylistd") && greylistd == "true" -%>
+USE_GREYLISTING = 1
+HAVE_GREYLIST = 1
+# HAVE_POSTGREY is undefined
+<% else -%>
+# HAVE_POSTGREY is undefined
+# HAVE_GREYLIST is undefined
+# USE_GREYLISTING is undefined
+<% end -%>
+<% if has_variable?("policydweight") && policydweight == "true" -%>
+HAVE_POLICYD = 1
+<% else -%>
+# HAVE_POLICYD is undefined
+<% end -%>
+<% if has_variable?("bugs_host") && bugs_host == "true" -%>
+HAVE_USER_DEBBUGS = 1
+<% else -%>
+# HAVE_USER_DEBBUGS is undefined
+<% end -%>
+<% if has_variable?("qa_host") && qa_host == "true" -%>
+HAVE_USER_QA = 1
+<% else -%>
+# HAVE_USER_QA is undefined
+<% end -%>
diff --git a/templates/exim-test.erb b/templates/exim-test.erb
deleted file mode 100644
index 94a571df..00000000
--- a/templates/exim-test.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% if has_variable?("clamd") && clamd == "true" -%>
-CLAMAV = clamd:/var/run/clamav/clamd.ctl
-<% else -%>
-# CLAMAV is undefined
-<% end -%>
-<% if has_variable?("postgrey") && postgrey == "true" -%>
-USE_GREYLISTING = 1
-# HAVE_GREYLIST is undefined
-HAVE_POSTGREY = 1
-<% elsif has_variable?("greylistd") && greylistd == "true" -%>
-USE_GREYLISTING = 1
-HAVE_GREYLIST = 1
-# HAVE_POSTGREY is undefined
-<% else -%>
-# HAVE_POSTGREY is undefined
-# HAVE_GREYLIST is undefined
-# USE_GREYLISTING is undefined
-<% end -%>
-<% if has_variable?("policydweight") && policydweight == "true" -%>
-HAVE_POLICYD = 1
-<% else -%>
-# HAVE_POLICYD is undefined
-<% end -%>
-<% if has_variable?("bugs_host") && bugs_host == "true" -%>
-HAVE_USER_DEBBUGS = 1
-<% else -%>
-# HAVE_USER_DEBBUGS is undefined
-<% end -%>
-<% if has_variable?("qa_host") && qa_host == "true" -%>
-HAVE_USER_QA = 1
-<% else -%>
-# HAVE_USER_QA is undefined
-<% end -%>