Move to collected manualroute

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index adbaf4d..981219a 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -87,8 +87,10 @@ class exim (
   file { '/etc/mailname':
     content => template('exim/mailname.erb'),
   }
-  file { '/etc/exim4/manualroute':
-    content => template('exim/manualroute.erb')
+  if ! defined(Class['exim::mailrelay']) {
+    file { '/etc/exim4/manualroute':
+      ensure => absent,
+    }
   }
   file { '/etc/exim4/locals':
     content => template('exim/locals.erb')

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
index 842d4da..4296d3c 100644 (file)
--- a/modules/exim/manifests/mailrelay.pp
+++ b/modules/exim/manifests/mailrelay.pp
@@ -12,15 +12,11 @@ class exim::mailrelay {
   }
 
 
-  file { '/etc/exim4/manualroute-new':
-    ensure => absent,
+  concat { '/etc/exim4/manualroute':
+    mode           => '0444',
+    ensure_newline => true,
+    warn           => '# This file is maintained with puppet',
+    require        => Package['exim4-daemon-heavy']
   }
-  #concat { '/etc/exim4/manualroute-new':
-  #  mode           => '0444',
-  #  ensure_newline => true,
-  #  warn           => '# This file is maintained with puppet',
-  #  require        => Package['exim4-daemon-heavy']
-  #}
-
-  #Concat::Fragment <<| tag == 'exim::manualroute::to::mailrelay' |>>
+  Concat::Fragment <<| tag == 'exim::manualroute::to::mailrelay' |>>
 }

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
deleted file mode 100644 (file)
index 8a07033..0000000
--- a/modules/exim/templates/manualroute.erb
+++ /dev/null
@@ -1,42 +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: foobar.debian.org::587 byname
-
-<%=
-mxmatches = [ @fqdn ]
-routes = []
-extraroutes = []
-
-if @is_mailrelay
-  mxmatches << 'mailout.debian.org'
-  mxmatches << 'INCOMING-MX'
-  extraroutes = [ ]
-  extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
-  extraroutes << "tracker.debian.org:\t\tticharich.debian.org"
-  extraroutes << "salsa.debian.org:\t\tgodard.debian.org"
-end
-
-mxregex = Regexp.new('^\d+\s+(.*?)\.?$')
-scope.lookupvar('deprecated::allnodeinfo').keys.sort.each do |host|
-  next unless scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord']
-  scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord'].each do |mx|
-    mxmatch = mxregex.match(mx)
-    if mxmatches.include?(mxmatch[1])
-      route = host + ":\t\t" + host
-      if scope.lookupvar('deprecated::localinfo').has_key?(host) and scope.lookupvar('deprecated::localinfo')[host].has_key?('mail_port') and scope.lookupvar('deprecated::localinfo')[host]['mail_port'].to_s != ''
-        route += "::" + scope.lookupvar('deprecated::localinfo')[host]['mail_port'].to_s
-      end
-      routes << route
-    end
-  end
-end
-
-routes << extraroutes
-
-routes.join("\n")
-%>