Downgrade mysql cookbook for now

It doesn't play well with our current dev server setup
This commit is contained in:
Greg Karékinian
2017-06-16 22:43:51 +02:00
parent e39792ea36
commit bdfb3a1afb
398 changed files with 12716 additions and 10889 deletions

View File

@@ -1,8 +1,8 @@
#
# Cookbook Name:: apache2
# Cookbook:: apache2
# Definition:: apache_config
#
# Copyright 2008-2013, Chef Software, Inc.
# Copyright:: 2008-2013, 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.
@@ -17,7 +17,7 @@
# limitations under the License.
#
define :apache_config, :enable => true do
define :apache_config, enable: true do
include_recipe 'apache2::default'
conf_name = "#{params[:name]}.conf"
@@ -26,7 +26,7 @@ define :apache_config, :enable => true do
if params[:enable]
execute "a2enconf #{conf_name}" do
command "/usr/sbin/a2enconf #{conf_name}"
notifies :reload, 'service[apache2]', :delayed
notifies :restart, 'service[apache2]', :delayed
not_if do
::File.symlink?("#{node['apache']['dir']}/conf-enabled/#{conf_name}") &&
(::File.exist?(params[:conf_path]) ? ::File.symlink?("#{node['apache']['dir']}/conf-enabled/#{conf_name}") : true)