Skip to content

Commit

Permalink
@node is deprecated, use node, chef commit f904589
Browse files Browse the repository at this point in the history
  • Loading branch information
jtimberman committed Jun 13, 2010
1 parent 51b293b commit 0da74e1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
32 changes: 16 additions & 16 deletions templates/default/main.cf.erb
@@ -1,6 +1,6 @@
###
# Generated by Chef for <%= @node[:fqdn] %>
# Configured as <%= @node[:postfix][:mail_type] %>
# Generated by Chef for <%= node[:fqdn] %>
# Configured as <%= node[:postfix][:mail_type] %>
###

biff = no
Expand All @@ -10,27 +10,27 @@ smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
smtpd_use_tls=yes
smtpd_tls_session_cache_database = btree:${queue_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache
smtp_sasl_auth_enable = <%= @node[:postfix][:smtp_sasl_auth_enable] %>
<% if @node[:postfix][:smtp_sasl_auth_enable] == "yes" -%>
smtp_sasl_password_maps = <%= @node[:postfix][:smtp_sasl_password_maps] %>
smtp_sasl_security_options = <%= @node[:postfix][:smtp_sasl_security_options] %>
smtp_tls_CAfile = <%= @node[:postfix][:smtp_tls_cafile] %>
smtp_use_tls = <%= @node[:postfix][:smtp_use_tls] %>
smtp_sasl_auth_enable = <%= node[:postfix][:smtp_sasl_auth_enable] %>
<% if node[:postfix][:smtp_sasl_auth_enable] == "yes" -%>
smtp_sasl_password_maps = <%= node[:postfix][:smtp_sasl_password_maps] %>
smtp_sasl_security_options = <%= node[:postfix][:smtp_sasl_security_options] %>
smtp_tls_CAfile = <%= node[:postfix][:smtp_tls_cafile] %>
smtp_use_tls = <%= node[:postfix][:smtp_use_tls] %>
<% end -%>
myhostname = <%= @node[:postfix][:myhostname] %>
mydomain = <%= @node[:postfix][:mydomain] %>
myorigin = <%= @node[:postfix][:myorigin] %>
myhostname = <%= node[:postfix][:myhostname] %>
mydomain = <%= node[:postfix][:mydomain] %>
myorigin = <%= node[:postfix][:myorigin] %>
smtpd_banner = $myhostname ESMTP $mail_name
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
mydestination = <%= @node[:postfix][:myhostname] %>, <%= @node[:hostname] %>, localhost.localdomain, localhost
<% if @node[:postfix][:mail_type] == "master" -%>
mydestination = <%= node[:postfix][:myhostname] %>, <%= node[:hostname] %>, localhost.localdomain, localhost
<% if node[:postfix][:mail_type] == "master" -%>
relayhost =
mynetworks = <%= @node[:postfix][:mail_relay_networks] %>
mynetworks = <%= node[:postfix][:mail_relay_networks] %>
inet_interfaces = all
<% else -%>
relayhost = <%= @node[:postfix][:relayhost] %>
mynetworks = <%= @node[:postfix][:mail_relay_networks] %>
relayhost = <%= node[:postfix][:relayhost] %>
mynetworks = <%= node[:postfix][:mail_relay_networks] %>
inet_interfaces = loopback-only
<% end -%>
mailbox_size_limit = 0
Expand Down
2 changes: 1 addition & 1 deletion templates/default/sasl_passwd.erb
@@ -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] %>

0 comments on commit 0da74e1

Please sign in to comment.