Merge pull request #46 from chihoko/spampd-options-fix
Fix spampd options
diff --git a/ChangeLog b/ChangeLog
index 36868a9..ef5bb63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
* Expanded TLS and client-TLS directives (#28, @adamcstephens).
* Cosmetic cleanups to main.cf templates.
* Fix ordering of postfix::file resources (#18).
+* Fix wrong smtps_content_filter parameter default (#32, @gwarf).
2014-05-12 - 0.3.3
* Add Debian support for spampd (#26, @timogoebel).
diff --git a/manifests/server.pp b/manifests/server.pp
index a1872bd..b847caa 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -81,11 +81,12 @@
$smtp_use_tls = false,
$canonical_maps = false,
$sender_canonical_maps = false,
+ $smtp_generic_maps = false,
$relocated_maps = false,
$extra_main_parameters = {},
# master.cf
$smtp_content_filter = [],
- $smtps_content_filter = $smtp_content_filter,
+ $smtps_content_filter = [],
$submission = false,
# EL5
$submission_smtpd_enforce_tls = 'yes',
diff --git a/templates/main.cf-el5.erb b/templates/main.cf-el5.erb
index 866db7b..95adb67 100644
--- a/templates/main.cf-el5.erb
+++ b/templates/main.cf-el5.erb
@@ -917,6 +917,10 @@
sender_canonical_maps = <%= @sender_canonical_maps %>
<% end -%>
+<% if @smtp_generic_maps -%>
+smtp_generic_maps = <%= @smtp_generic_maps %>
+
+<% end -%>
<% if ! @extra_main_parameters.empty? -%>
# Parameters set using 'extra_main_parameters'
<% @extra_main_parameters.sort_by {|key,value| key}.each do |key,value| -%>
diff --git a/templates/main.cf.erb b/templates/main.cf.erb
index c09ce70..84988e8 100644
--- a/templates/main.cf.erb
+++ b/templates/main.cf.erb
@@ -926,6 +926,10 @@
sender_canonical_maps = <%= @sender_canonical_maps %>
<% end -%>
+<% if @smtp_generic_maps -%>
+smtp_generic_maps = <%= @smtp_generic_maps %>
+
+<% end -%>
<% if @postscreen -%>
# Postscreen configuration
postscreen_access_list =
