Update cookbooks

This commit is contained in:
Greg Karékinian
2016-04-16 00:15:56 +02:00
parent 3854ab7232
commit c50b096c37
127 changed files with 1792 additions and 7431 deletions

View File

@@ -20,10 +20,9 @@
# limitations under the License.
#
unless platform_family?('windows')
mysql_client 'default' do
action :create
end
mysql_client 'default' do
action :create
not_if { node['platform_family'] == 'windows' }
end
mysql2_chef_gem 'default' do

View File

@@ -55,9 +55,8 @@ end
# The following block is specifically for OS's like CentOS that include a
# default site as a part of the install. This block will only be triggered if
# node['nginx']['default_site_enable'] is set to false.
if node['platform_family'] == 'rhel' && !node['nginx']['default_site_enabled']
file File.join(node['nginx']['dir'], 'conf.d', 'default.conf') do
action :delete
notifies :reload, 'service[nginx]'
end
file File.join(node['nginx']['dir'], 'conf.d', 'default.conf') do
action :delete
notifies :reload, 'service[nginx]'
only_if { node['platform_family'] == 'rhel' && !node['nginx']['default_site_enabled'] }
end