Merge branch 'COOK-668'

This commit is contained in:
jtimberman 2012-04-09 12:38:39 -06:00
commit 0332c34aea
3 changed files with 23 additions and 1 deletions

View File

@ -4,6 +4,8 @@ Description
Installs and configures postfix for client or outbound relayhost, or
to do SASL authentication.
On RHEL-family systems, sendmail will be replaced with postfix.
Requirements
============
@ -11,6 +13,8 @@ Requirements
* Ubuntu 10.04+
* Debian 6.0+
* RHEL/CentOS/Scientific 5.7+, 6.2+
* Amazon Linux (as of 4/9/2012)
Attributes
==========

View File

@ -6,7 +6,7 @@ version "0.8.4"
recipe "postfix", "Installs and configures postfix"
recipe "postfix::sasl_auth", "Set up postfix to auth to a server with sasl"
%w{ubuntu debian}.each do |os|
%w{ubuntu debian redhat centos}.each do |os|
supports os
end

View File

@ -23,9 +23,23 @@ package "postfix" do
end
service "postfix" do
supports :status => true, :restart => true, :reload => true
action :enable
end
case node[:platform]
when "redhat", "centos", "amazon", "scientific"
service "sendmail" do
action :nothing
end
execute "switch_mailer_to_postfix" do
command "/usr/sbin/alternatives --set mta /usr/sbin/sendmail.postfix"
notifies :stop, resources(:service => "sendmail")
notifies :start, resources(:service => "postfix")
not_if "/usr/bin/test /etc/alternatives/mta -ef /usr/sbin/sendmail.postfix"
end
end
%w{main master}.each do |cfg|
template "/etc/postfix/#{cfg}.cf" do
source "#{cfg}.cf.erb"
@ -35,3 +49,7 @@ end
notifies :restart, resources(:service => "postfix")
end
end
service "postfix" do
action :start
end