From d20ffe48a06b1606652de05cb680201f180d156c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 27 Aug 2016 20:59:11 +0000 Subject: [PATCH 1/3] Allow for empty content_filter This fixes Error: Failed to parse template postfix/master.cf.erb: Filepath: /etc/puppet/tvs-modules/postfix/templates/master.cf.erb Line: 39 Detail: undefined method `each' for nil:NilClass --- templates/master.cf-el5.erb | 6 +++++- templates/master.cf.erb | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/master.cf-el5.erb b/templates/master.cf-el5.erb index 760041e..426354a 100644 --- a/templates/master.cf-el5.erb +++ b/templates/master.cf-el5.erb @@ -7,9 +7,11 @@ # (yes) (yes) (yes) (never) (100) # ========================================================================== smtp inet n - n - - smtpd +<% if @smtp_content_filter -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> +<% end -%> <% if @submission -%> submission inet n - n - - smtpd -o smtpd_enforce_tls=<%= @submission_smtpd_enforce_tls %> @@ -21,10 +23,12 @@ smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject -<% @smtp_content_filter.each do |content_filter| -%> +<% if @smtps_content_filter -%> +<% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> <% end -%> +<% end -%> #628 inet n - n - - qmqpd pickup fifo n - n 60 1 pickup cleanup unix n - n - 0 cleanup diff --git a/templates/master.cf.erb b/templates/master.cf.erb index 248face..01867a3 100644 --- a/templates/master.cf.erb +++ b/templates/master.cf.erb @@ -16,9 +16,11 @@ tlsproxy unix - - n - 0 tlsproxy dnsblog unix - - n - 0 dnsblog smtpd pass - - n - - smtpd <% end -%> +<% if @smtp_content_filter -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> +<% end -%> <% if @submission -%> submission inet n - n - - smtpd -o smtpd_tls_security_level=<%= @submission_smtpd_tls_security_level %> @@ -32,10 +34,12 @@ smtps inet n - n - - smtpd -o smtpd_sasl_auth_enable=<%= @smtps_smtpd_sasl_auth_enable %> -o smtpd_client_restrictions=<%= @smtps_smtpd_client_restrictions %> -o milter_macro_daemon_name=ORIGINATING +<% if @smtps_content_filter -%> <% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> <% end -%> +<% end -%> #628 inet n - n - - qmqpd pickup fifo n - n 60 1 pickup cleanup unix n - n - 0 cleanup From a353a5438fffef575e8a462a7bd50bbff4b1ab0a Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 27 Aug 2016 21:29:08 +0000 Subject: [PATCH 2/3] use ! and .empty? --- templates/master.cf-el5.erb | 4 ++-- templates/master.cf.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/master.cf-el5.erb b/templates/master.cf-el5.erb index 426354a..d692c56 100644 --- a/templates/master.cf-el5.erb +++ b/templates/master.cf-el5.erb @@ -7,7 +7,7 @@ # (yes) (yes) (yes) (never) (100) # ========================================================================== smtp inet n - n - - smtpd -<% if @smtp_content_filter -%> +<% if !@smtp_content_filter.empty? -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> @@ -23,7 +23,7 @@ smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject -<% if @smtps_content_filter -%> +<% if !@smtps_content_filter.empty? -%> <% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> diff --git a/templates/master.cf.erb b/templates/master.cf.erb index 01867a3..a83fa89 100644 --- a/templates/master.cf.erb +++ b/templates/master.cf.erb @@ -16,7 +16,7 @@ tlsproxy unix - - n - 0 tlsproxy dnsblog unix - - n - 0 dnsblog smtpd pass - - n - - smtpd <% end -%> -<% if @smtp_content_filter -%> +<% if !@smtp_content_filter.empty? -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> @@ -34,7 +34,7 @@ smtps inet n - n - - smtpd -o smtpd_sasl_auth_enable=<%= @smtps_smtpd_sasl_auth_enable %> -o smtpd_client_restrictions=<%= @smtps_smtpd_client_restrictions %> -o milter_macro_daemon_name=ORIGINATING -<% if @smtps_content_filter -%> +<% if !@smtps_content_filter.empty? -%> <% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> From 5f1898f841c4a52439fd387f641025a720fa19f1 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 27 Aug 2016 21:31:35 +0000 Subject: [PATCH 3/3] Actually, can't use .empty on a nil, so rolling back --- templates/master.cf-el5.erb | 4 ++-- templates/master.cf.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/master.cf-el5.erb b/templates/master.cf-el5.erb index d692c56..426354a 100644 --- a/templates/master.cf-el5.erb +++ b/templates/master.cf-el5.erb @@ -7,7 +7,7 @@ # (yes) (yes) (yes) (never) (100) # ========================================================================== smtp inet n - n - - smtpd -<% if !@smtp_content_filter.empty? -%> +<% if @smtp_content_filter -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> @@ -23,7 +23,7 @@ smtps inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject -<% if !@smtps_content_filter.empty? -%> +<% if @smtps_content_filter -%> <% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> diff --git a/templates/master.cf.erb b/templates/master.cf.erb index a83fa89..01867a3 100644 --- a/templates/master.cf.erb +++ b/templates/master.cf.erb @@ -16,7 +16,7 @@ tlsproxy unix - - n - 0 tlsproxy dnsblog unix - - n - 0 dnsblog smtpd pass - - n - - smtpd <% end -%> -<% if !@smtp_content_filter.empty? -%> +<% if @smtp_content_filter -%> <% @smtp_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%> @@ -34,7 +34,7 @@ smtps inet n - n - - smtpd -o smtpd_sasl_auth_enable=<%= @smtps_smtpd_sasl_auth_enable %> -o smtpd_client_restrictions=<%= @smtps_smtpd_client_restrictions %> -o milter_macro_daemon_name=ORIGINATING -<% if !@smtps_content_filter.empty? -%> +<% if @smtps_content_filter -%> <% @smtps_content_filter.each do |content_filter| -%> -o content_filter=<%= content_filter %> <% end -%>