kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Update the mediawiki cookbook and upstream cookbooks

Browse Source 
Compatibility with Chef 14
This commit is contained in:
Greg Karékinian
2019-04-08 11:20:12 +02:00
parent 6e3e8cde1b
commit 777b85c2ab
312 changed files with 5603 additions and 14219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cookbooks/php-fpm/recipes/configure.rb
View File

@@ -1,9 +1,9 @@
#
# Author:: Seth Chisamore (<schisamo@opscode.com>)
# Author:: Seth Chisamore (<schisamo@chef.io>)
# Cookbook Name:: php-fpm
# Recipe:: package
#
# Copyright 2011, Opscode, Inc.
# Copyright 2011-2017, 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.
@@ -19,11 +19,11 @@
#
template node['php-fpm']['conf_file'] do
source "php-fpm.conf.erb"
source 'php-fpm.conf.erb'
mode 00644
owner "root"
group "root"
notifies :restart, "service[php-fpm]"
owner 'root'
group 'root'
notifies :restart, 'service[php-fpm]'
end
if node['php-fpm']['pools']
@@ -36,7 +36,7 @@ if node['php-fpm']['pools']
end
php_fpm_pool pool_name do
pool.each do |k, v|
self.params[k.to_sym] = v
params[k.to_sym] = v
end
end
end

2
cookbooks/php-fpm/recipes/default.rb
View File

@@ -3,7 +3,7 @@
# Cookbook Name:: php-fpm
# Recipe:: default
#
# Copyright 2011, Opscode, Inc.
# Copyright 2011-2017, 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.

43
cookbooks/php-fpm/recipes/install.rb
View File

@@ -3,7 +3,7 @@
# Cookbook Name:: php-fpm
# Recipe:: package
#
# Copyright 2011, Opscode, Inc.
# Copyright 2011-2017, 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.
@@ -19,42 +19,41 @@
#
include_recipe 'php-fpm::repository' unless node['php-fpm']['skip_repository_install']
include_recipe 'apt::default' if node['platform_family'] == 'debian'
if node['php-fpm']['package_name'].nil?
if platform_family?("rhel", "fedora")
php_fpm_package_name = "php-fpm"
elsif platform?('ubuntu') and node['platform_version'].to_f >= 16.04
php_fpm_package_name = "php7.0-fpm"
else
php_fpm_package_name = "php5-fpm"
end
else
php_fpm_package_name = node['php-fpm']['package_name']
end
php_fpm_package_name = if node['php-fpm']['package_name'].nil?
if platform_family?('rhel', 'fedora')
'php-fpm'
elsif platform?('ubuntu') && node['platform_version'].to_f >= 16.04
'php7.0-fpm'
else
'php5-fpm'
end
else
node['php-fpm']['package_name']
end
package php_fpm_package_name do
action node['php-fpm']['installation_action']
version node['php-fpm']['version'] if node['php-fpm']['version']
end
if node['php-fpm']['service_name'].nil?
php_fpm_service_name = php_fpm_package_name
else
php_fpm_service_name = node['php-fpm']['service_name']
end
php_fpm_service_name = if node['php-fpm']['service_name'].nil?
php_fpm_package_name
else
node['php-fpm']['service_name']
end
service_provider = nil
# this is actually already done in chef, but is kept here for older chef releases
if platform?('ubuntu') and node['platform_version'].to_f.between?(13.10, 14.10)
if platform?('ubuntu') && node['platform_version'].to_f.between?(13.10, 14.10)
service_provider = ::Chef::Provider::Service::Upstart
end
directory node['php-fpm']['log_dir']
service "php-fpm" do
service 'php-fpm' do
provider service_provider if service_provider
service_name php_fpm_service_name
supports :start => true, :stop => true, :restart => true, :reload => true
action [ :enable, :start ]
supports start: true, stop: true, restart: true, reload: true
action [:enable, :start]
end

52
cookbooks/php-fpm/recipes/repository.rb
View File

@@ -3,7 +3,7 @@
# Cookbook Name:: php-fpm
# Recipe:: package
#
# Copyright 2011, Opscode, Inc.
# Copyright 2011-2017, 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.
@@ -19,68 +19,30 @@
#
case node['platform']
when 'ubuntu'
if node['platform_version'].to_f <= 10.04
# Configure Brian's PPA
# We'll install php5-fpm from the Brian's PPA backports
apt_repository "brianmercer-php" do
uri "http://ppa.launchpad.net/brianmercer/php/ubuntu"
distribution node['lsb']['codename']
components ["main"]
keyserver "keyserver.ubuntu.com"
key "8D0DC64F"
action :add
end
# FIXME: apt-get update didn't trigger in above
execute "apt-get update"
end
when 'debian'
# Configure Dotdeb repos
# TODO: move this to it's own 'dotdeb' cookbook?
# http://www.dotdeb.org/instructions/
if node['platform_version'].to_f >= 8.0
apt_repository "dotdeb" do
apt_repository 'dotdeb' do
uri node['php-fpm']['dotdeb_repository']['uri']
distribution "jessie"
distribution 'jessie'
components ['all']
key node['php-fpm']['dotdeb_repository']['key']
action :add
end
elsif node['platform_version'].to_f >= 7.0
apt_repository "dotdeb" do
apt_repository 'dotdeb' do
uri node['php-fpm']['dotdeb_repository']['uri']
distribution "wheezy"
components ['all']
key node['php-fpm']['dotdeb_repository']['key']
action :add
end
elsif node['platform_version'].to_f >= 6.0
apt_repository "dotdeb" do
uri node['php-fpm']['dotdeb_repository']['uri']
distribution "squeeze"
components ['all']
key node['php-fpm']['dotdeb_repository']['key']
action :add
end
else
apt_repository "dotdeb" do
uri node['php-fpm']['dotdeb_repository']['uri']
distribution "oldstable"
components ['all']
key node['php-fpm']['dotdeb_repository']['key']
action :add
end
apt_repository "dotdeb-php53" do
uri node['php-fpm']['dotdeb-php53_repository']['uri']
distribution "oldstable"
distribution 'wheezy'
components ['all']
key node['php-fpm']['dotdeb_repository']['key']
action :add
end
end
when 'amazon', 'fedora', 'centos', 'redhat'
unless platform?('centos', 'redhat') && node['platform_version'].to_f >= 6.4
when 'amazon', 'fedora', 'centos', 'redhat', 'scientific', 'oracle'
unless platform?('centos', 'redhat') && node['platform_version'].to_f >= 6.4 # ~FC024
yum_repository 'remi' do
description 'Remi'
url node['php-fpm']['yum_url']