From: Stephen Gran <steve@lobefin.net>
Date: Sun, 21 Jun 2009 16:50:35 +0000 (+0100)
Subject: oops
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=52cd7b3bec6018336e6b7d9671b90cfc4f8d75ef;p=mirror%2Fdsa-puppet.git

oops
Revert "Put the bsmtp file under puppet"

This reverts commit 693a9c8b22f23f211871f1525b97879068e17fc1.
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 7b446db0a..a8868507d 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -47,10 +47,6 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
                        "puppet:///exim/common/helo-check" ]
           ;
-        "/etc/exim4/bsmtp":
-          require => Package["exim4-daemon-heavy"],
-          content => template("exim/bsmtp.erb")
-          ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
           content => template("exim/locals.erb")
diff --git a/modules/exim/templates/bsmtp.erb b/modules/exim/templates/bsmtp.erb
deleted file mode 100644
index 4ccd9f4a7..000000000
--- a/modules/exim/templates/bsmtp.erb
+++ /dev/null
@@ -1,24 +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
-##
-
-<%=
-bsmtp = case fqdn
-        when "gluck.debian.org" then "hal.debian.net: user=salve group=Debian file=/home/salve/bsmtp/hal.debian.net
-salve.debian.net: user=salve group=Debian file=/home/salve/bsmtp/salve.debian.net
-robin.debian.net: user=robert group=Debian file=/home/robert/bsmtp/robin.debian.net
-riva.debian.net: user=cjwatson group=Debian file=/home/cjwatson/bsmtp/riva.debian.net
-tryphon.debian.net: user=nboullis group=Debian file=/home/nboullis/bsmtp/tryphon.debian.net
-lucretia.debian.net: user=mechanix group=Debian file=/home/mechanix/bsmtp/lucretia.debian.net
-aegir.debian.net: user=mechanix group=Debian file=/home/mechanix/bsmtp/aegir.debian.net"
-        when "klecker.debian.org" then "hal.debian.net: user=salve group=Debian file=/home/salve/bsmtp/hal.debian.net
-salve.debian.net: user=salve group=Debian file=/home/salve/bsmtp/salve.debian.net
-robin.debian.net: user=robert group=Debian file=/home/robert/bsmtp/robin.debian.net
-riva.debian.net: user=cjwatson group=Debian file=/home/cjwatson/bsmtp/riva.debian.net
-tryphon.debian.net: user=nboullis group=Debian file=/home/nboullis/bsmtp/tryphon.debian.net
-lucretia.debian.net: user=mechanix group=Debian file=/home/mechanix/bsmtp/lucretia.debian.net
-aegir.debian.net: user=mechanix group=Debian file=/home/mechanix/bsmtp/aegir.debian.net"
-end
-bsmtp
-%>