Update upstream cookbooks
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
# encoding: utf-8
|
||||
#
|
||||
# Author:: Joshua Timberman(<joshua@chef.io>)
|
||||
# Cookbook Name:: postfix
|
||||
# Cookbook:: postfix
|
||||
# Recipe:: sasl_auth
|
||||
#
|
||||
# Copyright 2009-2014, Chef Software, Inc.
|
||||
# Copyright:: 2009-2016, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -29,11 +28,11 @@ case node['platform_family']
|
||||
when 'debian'
|
||||
sasl_pkgs = %w(libsasl2-2 libsasl2-modules ca-certificates)
|
||||
when 'rhel'
|
||||
if node['platform_version'].to_i < 6
|
||||
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain openssl)
|
||||
else
|
||||
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
|
||||
end
|
||||
sasl_pkgs = if node['platform_version'].to_i < 6
|
||||
%w(cyrus-sasl cyrus-sasl-plain openssl)
|
||||
else
|
||||
%w(cyrus-sasl cyrus-sasl-plain ca-certificates)
|
||||
end
|
||||
when 'fedora'
|
||||
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
|
||||
end
|
||||
@@ -53,7 +52,7 @@ template node['postfix']['sasl_password_file'] do
|
||||
source 'sasl_passwd.erb'
|
||||
owner 'root'
|
||||
group node['root_group']
|
||||
mode 0400
|
||||
mode '400'
|
||||
notifies :run, 'execute[postmap-sasl_passwd]', :immediately
|
||||
notifies :restart, 'service[postfix]'
|
||||
variables(settings: node['postfix']['sasl'])
|
||||
|
||||
Reference in New Issue
Block a user