opendev
/
puppet-exim
Code Issues Proposed changes

Move user-supplied routers to the end 

We want Mailman routers to be last, and they are, but I'd like to
replace the built-in ones in this module with user-supplied routers
instead, so move the user-supplied routers to the end.

Change-Id: I090070308785d4b55bac12806a05e2896306c0a3
Story: 2001382
Task: 6091
This commit is contained in:
James E. Blair 2017-12-12 10:44:55 -08:00 committed by James E. Blair
parent 099455fd6b
commit 153a21cda8
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
templates/exim4.conf.erb
View File

@ -568,25 +568,6 @@ acl_check_data:
begin routers
<% @routers.each do |router| -%>
<% router.each_pair do |name, values| -%>
<%= name %>:
<% if values.has_key?('driver') -%>
driver = <%= values['driver'] %>
<% end -%>
<% values.keys.sort.each do |k| -%>
<% if k != 'driver' -%>
<% if values[k] == true -%>
<%= k %>
<% else -%>
<%= k %> = <%= values[k] %>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
# This router routes to remote hosts over SMTP by explicit IP address,
# when an email address is given in "domain literal" form, for example,
# <user@[192.168.35.64]>. The RFCs require this facility. However, it is
@ -716,6 +697,24 @@ mailman_router:
transport = mailman_transport
<% end -%>
<% @routers.each do |router| -%>
<% router.each_pair do |name, values| -%>
<%= name %>:
<% if values.has_key?('driver') -%>
driver = <%= values['driver'] %>
<% end -%>
<% values.keys.sort.each do |k| -%>
<% if k != 'driver' -%>
<% if values[k] == true -%>
<%= k %>
<% else -%>
<%= k %> = <%= values[k] %>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
######################################################################
# TRANSPORTS CONFIGURATION #