Downgrade mysql cookbook for now
It doesn't play well with our current dev server setup
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: apache2
|
||||
# Cookbook:: apache2
|
||||
# Definition:: apache_conf
|
||||
#
|
||||
# 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_conf, :enable => true do
|
||||
define :apache_conf, enable: true do
|
||||
include_recipe 'apache2::default'
|
||||
|
||||
conf_name = "#{params[:name]}.conf"
|
||||
@@ -34,7 +34,7 @@ define :apache_conf, :enable => true do
|
||||
group node['apache']['root_group']
|
||||
backup false
|
||||
mode '0644'
|
||||
notifies :reload, 'service[apache2]', :delayed
|
||||
notifies :restart, 'service[apache2]', :delayed
|
||||
end
|
||||
|
||||
if params[:enable]
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: apache2
|
||||
# Cookbook:: apache2
|
||||
# Definition:: apache_mod
|
||||
#
|
||||
# Copyright 2008-20013, 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.
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: apache2
|
||||
# Cookbook:: apache2
|
||||
# Definition:: apache_module
|
||||
#
|
||||
# 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_module, :enable => true, :conf => false, :restart => false do
|
||||
define :apache_module, enable: true, conf: false, restart: false do
|
||||
include_recipe 'apache2::default'
|
||||
|
||||
params[:filename] = params[:filename] || "mod_#{params[:name]}.so"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: apache2
|
||||
# Cookbook:: apache2
|
||||
# Definition:: apache_site
|
||||
#
|
||||
# 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_site, :enable => true do
|
||||
define :apache_site, enable: true do
|
||||
include_recipe 'apache2::default'
|
||||
conf_name = "#{params[:name]}.conf"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: apache2
|
||||
# Cookbook:: apache2
|
||||
# Definition:: web_app
|
||||
#
|
||||
# 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 :web_app, :template => 'web_app.conf.erb', :local => false, :enable => true do
|
||||
define :web_app, template: 'web_app.conf.erb', local: false, enable: true, server_port: 80 do
|
||||
application_name = params[:name]
|
||||
|
||||
include_recipe 'apache2::default'
|
||||
@@ -33,8 +33,8 @@ define :web_app, :template => 'web_app.conf.erb', :local => false, :enable => tr
|
||||
mode '0644'
|
||||
cookbook params[:cookbook] if params[:cookbook]
|
||||
variables(
|
||||
:application_name => application_name,
|
||||
:params => params
|
||||
application_name: application_name,
|
||||
params: params
|
||||
)
|
||||
if ::File.exist?("#{node['apache']['dir']}/sites-enabled/#{application_name}.conf")
|
||||
notifies :reload, 'service[apache2]', :delayed
|
||||
|
||||
Reference in New Issue
Block a user