From 056eeb7efa04117d0bd9f2a0fdb095b4c4c2bb45 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 5 Oct 2009 01:38:38 +0100 Subject: [PATCH] manualroute is now a template Signed-off-by: Stephen Gran --- modules/exim/files/common/manualroute | 8 ---- .../per-host/draghi.debian.org/manualroute | 28 ------------- .../per-host/luchesi.debian.org/manualroute | 11 ------ .../per-host/spohr.debian.org/manualroute | 28 ------------- modules/exim/manifests/init.pp | 3 +- modules/exim/templates/manualroute.erb | 39 +++++++++++++++++++ 6 files changed, 40 insertions(+), 77 deletions(-) delete mode 100644 modules/exim/files/common/manualroute delete mode 100644 modules/exim/files/per-host/draghi.debian.org/manualroute delete mode 100644 modules/exim/files/per-host/luchesi.debian.org/manualroute delete mode 100644 modules/exim/files/per-host/spohr.debian.org/manualroute create mode 100644 modules/exim/templates/manualroute.erb diff --git a/modules/exim/files/common/manualroute b/modules/exim/files/common/manualroute deleted file mode 100644 index 720c6f532..000000000 --- a/modules/exim/files/common/manualroute +++ /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 -## -## Format: -## domain: hostname[::port] options -## example: -## buildd.debian.org: raff.debian.org::587 byname diff --git a/modules/exim/files/per-host/draghi.debian.org/manualroute b/modules/exim/files/per-host/draghi.debian.org/manualroute deleted file mode 100644 index 68fceb6e4..000000000 --- a/modules/exim/files/per-host/draghi.debian.org/manualroute +++ /dev/null @@ -1,28 +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 -## -## Format: -## domain: hostname[::port] options -## example: -## buildd.debian.org: raff.debian.org::587 byname - -ancina.debian.org: ancina.debian.org::2025 -arcadelt.debian.org: arcadelt.debian.org::25 -argento.debian.org: argento.debian.org::25 -brahms.debian.org: brahms.debian.org::25 -goedel.debian.org: goedel.debian.org::25 -goetz.debian.org: goetz.debian.org::25 -kassia.debian.org: kassia.debian.org::587 -lafayette.debian.org: lafayette.debian.org::25 -lebrun.debian.org: lebrun.debian.org::25 -malo.debian.org: malo.debian.org::25 -mayer.debian.org: mayer.debian.org::25 -murphy.debian.org: murphy.debian.org::25 -paer.debian.org: paer.debian.org::25 -piatti.debian.org: piatti.debian.org::2025 -praetorius.debian.org: praetorius.debian.org::25 -puccini.debian.org: puccini.debian.org::25 -rem.debian.org: rem.debian.org::25 -schroeder.debian.org: schroeder.debian.org::25 -spontini.debian.org: spontini.debian.org::25 diff --git a/modules/exim/files/per-host/luchesi.debian.org/manualroute b/modules/exim/files/per-host/luchesi.debian.org/manualroute deleted file mode 100644 index 25d052ef9..000000000 --- a/modules/exim/files/per-host/luchesi.debian.org/manualroute +++ /dev/null @@ -1,11 +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 -## -## Format: -## domain: hostname[::port] options -## example: -## buildd.debian.org: raff.debian.org::587 byname - -finzi.debian.org: [172.17.12.2]::25 -fano.debian.org: [172.17.12.3]::25 diff --git a/modules/exim/files/per-host/spohr.debian.org/manualroute b/modules/exim/files/per-host/spohr.debian.org/manualroute deleted file mode 100644 index 68fceb6e4..000000000 --- a/modules/exim/files/per-host/spohr.debian.org/manualroute +++ /dev/null @@ -1,28 +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 -## -## Format: -## domain: hostname[::port] options -## example: -## buildd.debian.org: raff.debian.org::587 byname - -ancina.debian.org: ancina.debian.org::2025 -arcadelt.debian.org: arcadelt.debian.org::25 -argento.debian.org: argento.debian.org::25 -brahms.debian.org: brahms.debian.org::25 -goedel.debian.org: goedel.debian.org::25 -goetz.debian.org: goetz.debian.org::25 -kassia.debian.org: kassia.debian.org::587 -lafayette.debian.org: lafayette.debian.org::25 -lebrun.debian.org: lebrun.debian.org::25 -malo.debian.org: malo.debian.org::25 -mayer.debian.org: mayer.debian.org::25 -murphy.debian.org: murphy.debian.org::25 -paer.debian.org: paer.debian.org::25 -piatti.debian.org: piatti.debian.org::2025 -praetorius.debian.org: praetorius.debian.org::25 -puccini.debian.org: puccini.debian.org::25 -rem.debian.org: rem.debian.org::25 -schroeder.debian.org: schroeder.debian.org::25 -spontini.debian.org: spontini.debian.org::25 diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index 6861b44be..1bee23240 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -28,8 +28,7 @@ class exim { ; "/etc/exim4/manualroute": require => Package["exim4-daemon-heavy"], - source => [ "puppet:///exim/per-host/$fqdn/manualroute", - "puppet:///exim/common/manualroute" ] + content => template("exim/manualroute.erb") ; "/etc/exim4/host_blacklist": require => Package["exim4-daemon-heavy"], diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb new file mode 100644 index 000000000..770e95421 --- /dev/null +++ b/modules/exim/templates/manualroute.erb @@ -0,0 +1,39 @@ +## +## 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 +## +## Format: +## domain: hostname[::port] options +## example: +## buildd.debian.org: raff.debian.org::587 byname + +<%= +routes = case fqdn + when 'spohr.debian.org', 'draghi.debian.org' then ' +ancina.debian.org: ancina.debian.org::2025 +arcadelt.debian.org: arcadelt.debian.org::25 +argento.debian.org: argento.debian.org::25 +brahms.debian.org: brahms.debian.org::25 +goedel.debian.org: goedel.debian.org::25 +goetz.debian.org: goetz.debian.org::25 +kassia.debian.org: kassia.debian.org::587 +lafayette.debian.org: lafayette.debian.org::25 +lebrun.debian.org: lebrun.debian.org::25 +malo.debian.org: malo.debian.org::25 +mayer.debian.org: mayer.debian.org::25 +murphy.debian.org: murphy.debian.org::25 +paer.debian.org: paer.debian.org::25 +piatti.debian.org: piatti.debian.org::2025 +praetorius.debian.org: praetorius.debian.org::25 +puccini.debian.org: puccini.debian.org::25 +rem.debian.org: rem.debian.org::25 +schroeder.debian.org: schroeder.debian.org::25 +spontini.debian.org: spontini.debian.org::25 +' + when 'luchesi.debian.org' then ' +finzi.debian.org: [172.17.12.2]::25 +fano.debian.org: [172.17.12.3]::25 +' +end +routes +%> -- 2.20.1