From 6d715cfa572e0b6b90b0c4782e884d5de29c68fe Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 15 Nov 2009 03:02:20 +0000 Subject: [PATCH] nothing uses this template now Signed-off-by: Stephen Gran --- modules/exim/manifests/init.pp | 5 --- modules/samhain/templates/samhainrc.erb | 1 - templates/exim-local-auto.erb | 49 ------------------------- 3 files changed, 55 deletions(-) delete mode 100644 templates/exim-local-auto.erb diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index 0b5f7d675..1857b6129 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -107,11 +107,6 @@ 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"), - notify => Exec["exim4 reload"] - ; "/etc/exim4/ssl/thishost.crt": require => Package["exim4-daemon-heavy"], source => "puppet:///exim/certs/$fqdn.crt", diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index e99822a21..b1bf2ac65 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -241,7 +241,6 @@ file=/etc/exim4/rcpthosts file=/etc/exim4/rhsbllist file=/etc/exim4/virtualdomains file=/etc/exim4/whitelist -file=/etc/exim4/local-auto.conf file=/etc/exim4/local-settings.conf file=/etc/exim4/ssl/ca.crt file=/etc/exim4/ssl/ca.crl diff --git a/templates/exim-local-auto.erb b/templates/exim-local-auto.erb deleted file mode 100644 index 0412dcd07..000000000 --- a/templates/exim-local-auto.erb +++ /dev/null @@ -1,49 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -# Various bits of software -<% 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 -%> - -# user settings (controls some mail routing) -<% 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 -%> - -# SSL stuff for mail relays -<% if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" -%> -USE_TLS = 1 -<% else -%> -# USE_TLS is undefined -<% end -%> - -- 2.20.1