From 667af6550992e9454505aa27765ed3e20b0b2225 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 15 Mar 2009 17:09:03 +0000 Subject: [PATCH] OK, I think it works now. Go live. what can possibly go wrong? Signed-off-by: Stephen Gran --- manifests/site.pp | 4 ---- modules/exim/manifests/init.pp | 13 ++++--------- templates/{exim-test.erb => exim-local-auto.erb} | 0 3 files changed, 4 insertions(+), 13 deletions(-) rename templates/{exim-test.erb => exim-local-auto.erb} (100%) 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-test.erb b/templates/exim-local-auto.erb similarity index 100% rename from templates/exim-test.erb rename to templates/exim-local-auto.erb -- 2.39.2