From: Peter Palfrader Date: Thu, 30 Apr 2009 20:20:30 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=338a66becb884da33ef341815646478ec9ae1c21;hp=977b1ae677abe983c323de5c117910e3c21d603d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: Mention that we verified the cert --- diff --git a/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf b/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf deleted file mode 100644 index 018dc678c..000000000 --- a/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf +++ /dev/null @@ -1,8 +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 -## - -SMARTHOST = spohr.debian.org -SMARTHST_PORT = 587 -MAIL_IN_VIA_SUBMISSION = 1 diff --git a/modules/exim/files/per-host/spohr.debian.org/manualroute b/modules/exim/files/per-host/spohr.debian.org/manualroute index f6c92027e..cb67d7d64 100644 --- a/modules/exim/files/per-host/spohr.debian.org/manualroute +++ b/modules/exim/files/per-host/spohr.debian.org/manualroute @@ -11,7 +11,6 @@ allegri.debian.org: allegri.debian.org::2025 ancina.debian.org: ancina.debian.org::2025 kassia.debian.org: kassia.debian.org::587 -lafayette.debian.org: lafayette.debian.org::587 piatti.debian.org: piatti.debian.org::2025 # postfix: