@node is deprecated, use node, chef commit f904589

This commit is contained in:
jtimberman 2010-06-13 13:16:20 -06:00
parent 51b293bbf5
commit 0da74e1490
2 changed files with 17 additions and 17 deletions

View File

@ -1,6 +1,6 @@
### ###
# Generated by Chef for <%= @node[:fqdn] %> # Generated by Chef for <%= node[:fqdn] %>
# Configured as <%= @node[:postfix][:mail_type] %> # Configured as <%= node[:postfix][:mail_type] %>
### ###
biff = no biff = no
@ -10,27 +10,27 @@ smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
smtpd_use_tls=yes smtpd_use_tls=yes
smtpd_tls_session_cache_database = btree:${queue_directory}/smtpd_scache smtpd_tls_session_cache_database = btree:${queue_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache
smtp_sasl_auth_enable = <%= @node[:postfix][:smtp_sasl_auth_enable] %> smtp_sasl_auth_enable = <%= node[:postfix][:smtp_sasl_auth_enable] %>
<% if @node[:postfix][:smtp_sasl_auth_enable] == "yes" -%> <% if node[:postfix][:smtp_sasl_auth_enable] == "yes" -%>
smtp_sasl_password_maps = <%= @node[:postfix][:smtp_sasl_password_maps] %> smtp_sasl_password_maps = <%= node[:postfix][:smtp_sasl_password_maps] %>
smtp_sasl_security_options = <%= @node[:postfix][:smtp_sasl_security_options] %> smtp_sasl_security_options = <%= node[:postfix][:smtp_sasl_security_options] %>
smtp_tls_CAfile = <%= @node[:postfix][:smtp_tls_cafile] %> smtp_tls_CAfile = <%= node[:postfix][:smtp_tls_cafile] %>
smtp_use_tls = <%= @node[:postfix][:smtp_use_tls] %> smtp_use_tls = <%= node[:postfix][:smtp_use_tls] %>
<% end -%> <% end -%>
myhostname = <%= @node[:postfix][:myhostname] %> myhostname = <%= node[:postfix][:myhostname] %>
mydomain = <%= @node[:postfix][:mydomain] %> mydomain = <%= node[:postfix][:mydomain] %>
myorigin = <%= @node[:postfix][:myorigin] %> myorigin = <%= node[:postfix][:myorigin] %>
smtpd_banner = $myhostname ESMTP $mail_name smtpd_banner = $myhostname ESMTP $mail_name
alias_maps = hash:/etc/aliases alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases alias_database = hash:/etc/aliases
mydestination = <%= @node[:postfix][:myhostname] %>, <%= @node[:hostname] %>, localhost.localdomain, localhost mydestination = <%= node[:postfix][:myhostname] %>, <%= node[:hostname] %>, localhost.localdomain, localhost
<% if @node[:postfix][:mail_type] == "master" -%> <% if node[:postfix][:mail_type] == "master" -%>
relayhost = relayhost =
mynetworks = <%= @node[:postfix][:mail_relay_networks] %> mynetworks = <%= node[:postfix][:mail_relay_networks] %>
inet_interfaces = all inet_interfaces = all
<% else -%> <% else -%>
relayhost = <%= @node[:postfix][:relayhost] %> relayhost = <%= node[:postfix][:relayhost] %>
mynetworks = <%= @node[:postfix][:mail_relay_networks] %> mynetworks = <%= node[:postfix][:mail_relay_networks] %>
inet_interfaces = loopback-only inet_interfaces = loopback-only
<% end -%> <% end -%>
mailbox_size_limit = 0 mailbox_size_limit = 0

View File

@ -1 +1 @@
<%= @node[:postfix][:relayhost] %> <%= @node[:postfix][:smtp_sasl_user_name] %>:<%= @node[:postfix][:smtp_sasl_passwd] %> <%= node[:postfix][:relayhost] %> <%= node[:postfix][:smtp_sasl_user_name] %>:<%= node[:postfix][:smtp_sasl_passwd] %>