Add missing changes for mediawiki upgrades
This commit is contained in:
@@ -18,13 +18,14 @@
|
||||
#
|
||||
|
||||
lib_dir = 'lib'
|
||||
|
||||
default['php']['install_method'] = 'package'
|
||||
default['php']['directives'] = {}
|
||||
default['php']['bin'] = 'php'
|
||||
|
||||
default['php']['pecl'] = 'pecl'
|
||||
|
||||
default['php']['version'] = '5.6.30'
|
||||
default['php']['version'] = '7.2.31'
|
||||
|
||||
default['php']['pear'] = '/usr/bin/pear'
|
||||
default['php']['pear_setup'] = true
|
||||
@@ -33,20 +34,23 @@ default['php']['pear_channels'] = [
|
||||
'pecl.php.net',
|
||||
]
|
||||
|
||||
default['php']['url'] = 'http://us1.php.net/get'
|
||||
default['php']['checksum'] = '8bc7d93e4c840df11e3d9855dcad15c1b7134e8acf0cf3b90b932baea2d0bde2'
|
||||
default['php']['url'] = 'https://www.php.net/distributions'
|
||||
default['php']['checksum'] = '796837831ccebf00dc15921ed327cfbac59177da41b33044d9a6c7134cdd250c' # checksum of the .tar.gz files
|
||||
default['php']['prefix_dir'] = '/usr/local'
|
||||
default['php']['enable_mod'] = '/usr/sbin/php5enmod'
|
||||
default['php']['disable_mod'] = '/usr/sbin/php5dismod'
|
||||
default['php']['enable_mod'] = '/usr/sbin/phpenmod'
|
||||
default['php']['disable_mod'] = '/usr/sbin/phpdismod'
|
||||
|
||||
default['php']['ini']['template'] = 'php.ini.erb'
|
||||
default['php']['ini']['cookbook'] = 'php'
|
||||
|
||||
default['php']['fpm_socket'] = '/var/run/php5-fpm.sock'
|
||||
default['php']['fpm_socket'] = '/var/run/php7.2-fpm.sock'
|
||||
default['php']['fpm_conf_dir'] = nil
|
||||
default['php']['fpm_ini_control'] = false
|
||||
|
||||
case node['platform_family']
|
||||
when 'rhel', 'fedora', 'amazon'
|
||||
when 'rhel', 'amazon'
|
||||
lib_dir = node['kernel']['machine'] =~ /x86_64/ ? 'lib64' : 'lib'
|
||||
|
||||
default['php']['conf_dir'] = '/etc'
|
||||
default['php']['ext_conf_dir'] = '/etc/php.d'
|
||||
default['php']['fpm_user'] = 'nobody'
|
||||
@@ -54,21 +58,14 @@ when 'rhel', 'fedora', 'amazon'
|
||||
default['php']['fpm_listen_user'] = 'nobody'
|
||||
default['php']['fpm_listen_group'] = 'nobody'
|
||||
default['php']['ext_dir'] = "/usr/#{lib_dir}/php/modules"
|
||||
if node['platform'] == 'amazon' # amazon names their packages with versions on 201X amazon
|
||||
default['php']['src_deps'] = %w(bzip2-devel libc-client-devel curl-devel freetype-devel gmp-devel libjpeg-devel krb5-devel libmcrypt-devel libpng-devel openssl-devel t1lib-devel libxml2-devel libxslt-devel zlib-devel)
|
||||
default['php']['fpm_package'] = 'php-fpm'
|
||||
|
||||
if node['platform_version'].to_i == 2
|
||||
default['php']['packages'] = %w(php php-devel php-pear)
|
||||
default['php']['fpm_package'] = 'php-fpm'
|
||||
else
|
||||
default['php']['packages'] = %w(php56 php56-devel php-pear)
|
||||
default['php']['fpm_package'] = 'php56-fpm'
|
||||
end
|
||||
else # redhat does not name their packages with version on RHEL 6+
|
||||
default['php']['src_deps'] = %w(bzip2-devel libc-client-devel curl-devel freetype-devel gmp-devel libjpeg-devel krb5-devel libmcrypt-devel libpng-devel openssl-devel t1lib-devel libxml2-devel libxslt-devel zlib-devel mhash-devel)
|
||||
default['php']['packages'] = %w(php php-devel php-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php-fpm'
|
||||
end
|
||||
default['php']['src_deps'] = if platform?('amazon') || node['platform_version'].to_i < 8
|
||||
%w(bzip2-devel libc-client-devel curl-devel freetype-devel gmp-devel libjpeg-devel krb5-devel libmcrypt-devel libpng-devel openssl-devel t1lib-devel libxml2-devel libxslt-devel zlib-devel mhash-devel)
|
||||
else # redhat does not name their packages with version on RHEL 6+
|
||||
%w(bzip2-devel libc-client-devel curl-devel freetype-devel gmp-devel libjpeg-devel krb5-devel libmcrypt-devel libpng-devel openssl-devel libxml2-devel libxslt-devel zlib-devel mhash-devel)
|
||||
end
|
||||
default['php']['packages'] = %w(php php-devel php-cli php-pear)
|
||||
default['php']['fpm_pooldir'] = '/etc/php-fpm.d'
|
||||
default['php']['fpm_default_conf'] = '/etc/php-fpm.d/www.conf'
|
||||
default['php']['fpm_service'] = 'php-fpm'
|
||||
@@ -79,86 +76,73 @@ when 'rhel', 'fedora', 'amazon'
|
||||
default['php']['fpm_listen_group'] = 'apache'
|
||||
end
|
||||
when 'debian'
|
||||
default['php']['conf_dir'] = '/etc/php5/cli'
|
||||
default['php']['ext_conf_dir'] = '/etc/php5/conf.d'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng12-dev libssl-dev libt1-dev libxml2-dev libxslt-dev zlib1g-dev)
|
||||
default['php']['packages'] = %w(php5-cgi php5 php5-dev php5-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php5-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php5/fpm/pool.d'
|
||||
default['php']['fpm_user'] = 'www-data'
|
||||
default['php']['fpm_group'] = 'www-data'
|
||||
default['php']['version'] = '7.0.4'
|
||||
default['php']['checksum'] = 'f6cdac2fd37da0ac0bbcee0187d74b3719c2f83973dfe883d5cde81c356fe0a8'
|
||||
default['php']['conf_dir'] = '/etc/php/7.0/cli'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg-dev libkrb5-dev libmcrypt-dev libpng-dev libssl-dev pkg-config libxml2-dev)
|
||||
default['php']['packages'] = %w(php7.0-cgi php7.0 php7.0-dev php7.0-cli php-pear)
|
||||
default['php']['disable_mod'] = '/usr/sbin/phpdismod'
|
||||
default['php']['enable_mod'] = '/usr/sbin/phpenmod'
|
||||
default['php']['fpm_default_conf'] = '/etc/php/7.0/fpm/pool.d/www.conf'
|
||||
default['php']['fpm_conf_dir'] = '/etc/php/7.0/fpm'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.0/mods-available'
|
||||
default['php']['fpm_package'] = 'php7.0-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php/7.0/fpm/pool.d'
|
||||
default['php']['fpm_service'] = 'php7.0-fpm'
|
||||
default['php']['fpm_socket'] = '/var/run/php/php7.0-fpm.sock'
|
||||
default['php']['fpm_user'] = 'www-data'
|
||||
default['php']['fpm_group'] = 'www-data'
|
||||
default['php']['fpm_listen_user'] = 'www-data'
|
||||
default['php']['fpm_listen_group'] = 'www-data'
|
||||
default['php']['fpm_service'] = 'php5-fpm'
|
||||
default['php']['fpm_default_conf'] = '/etc/php5/fpm/pool.d/www.conf'
|
||||
|
||||
if (platform?('debian') && node['platform_version'].to_i >= 9) ||
|
||||
(platform?('ubuntu') && node['platform_version'].to_f == 16.04)
|
||||
default['php']['version'] = '7.0.4'
|
||||
default['php']['checksum'] = 'f6cdac2fd37da0ac0bbcee0187d74b3719c2f83973dfe883d5cde81c356fe0a8'
|
||||
default['php']['conf_dir'] = '/etc/php/7.0/cli'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng12-dev libssl-dev pkg-config libxml2-dev)
|
||||
default['php']['packages'] = %w(php7.0-cgi php7.0 php7.0-dev php7.0-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php7.0-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php/7.0/fpm/pool.d'
|
||||
default['php']['fpm_service'] = 'php7.0-fpm'
|
||||
default['php']['fpm_socket'] = '/var/run/php/php7.0-fpm.sock'
|
||||
default['php']['fpm_default_conf'] = '/etc/php/7.0/fpm/pool.d/www.conf'
|
||||
default['php']['enable_mod'] = '/usr/sbin/phpenmod'
|
||||
default['php']['disable_mod'] = '/usr/sbin/phpdismod'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.0/mods-available'
|
||||
elsif platform?('ubuntu') && node['platform_version'].to_f >= 18.04
|
||||
default['php']['version'] = '7.0.4'
|
||||
default['php']['checksum'] = 'f6cdac2fd37da0ac0bbcee0187d74b3719c2f83973dfe883d5cde81c356fe0a8'
|
||||
if platform?('debian') && node['platform_version'].to_i >= 10
|
||||
default['php']['version'] = '7.3.19'
|
||||
default['php']['checksum'] = '809126b46d62a1a06c2d5a0f9d7ba61aba40e165f24d2d185396d0f9646d3280'
|
||||
default['php']['conf_dir'] = '/etc/php/7.3/cli'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-turbo-dev libkrb5-dev libmcrypt-dev libpng-dev libssl-dev pkg-config libxml2-dev file re2c libzip-dev)
|
||||
# Debian >= 10 drops versions from the package names
|
||||
default['php']['packages'] = %w(php-cgi php php-dev php-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php7.3-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php/7.3/fpm/pool.d'
|
||||
default['php']['fpm_service'] = 'php7.3-fpm'
|
||||
default['php']['fpm_socket'] = '/var/run/php/php7.3-fpm.sock'
|
||||
default['php']['fpm_default_conf'] = '/etc/php/7.3/fpm/pool.d/www.conf'
|
||||
default['php']['fpm_conf_dir'] = '/etc/php/7.3/fpm'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.3/mods-available'
|
||||
elsif platform?('ubuntu') && node['platform_version'].to_f == 18.04
|
||||
default['php']['version'] = '7.2.31'
|
||||
default['php']['checksum'] = '796837831ccebf00dc15921ed327cfbac59177da41b33044d9a6c7134cdd250c'
|
||||
default['php']['conf_dir'] = '/etc/php/7.2/cli'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng12-dev libssl-dev pkg-config libxml2-dev)
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng-dev libssl-dev pkg-config libxml2-dev)
|
||||
default['php']['packages'] = %w(php7.2-cgi php7.2 php7.2-dev php7.2-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php7.2-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php/7.2/fpm/pool.d'
|
||||
default['php']['fpm_service'] = 'php7.2-fpm'
|
||||
default['php']['fpm_socket'] = '/var/run/php/php7.2-fpm.sock'
|
||||
default['php']['fpm_default_conf'] = '/etc/php/7.2/fpm/pool.d/www.conf'
|
||||
default['php']['fpm_conf_dir'] = '/etc/php/7.2/fpm'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.2/mods-available'
|
||||
elsif platform?('ubuntu') && node['platform_version'].to_f >= 20.04
|
||||
default['php']['version'] = '7.4.7'
|
||||
default['php']['checksum'] = 'a554a510190e726ebe7157fb00b4aceabdb50c679430510a3b93cbf5d7546e44'
|
||||
default['php']['conf_dir'] = '/etc/php/7.4/cli'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng-dev libssl-dev pkg-config libxml2-dev libsqlite3-dev libonig-dev)
|
||||
# Ubuntu >= 20.04 drops versions from the package names
|
||||
default['php']['packages'] = %w(php-cgi php php-dev php-cli php-pear)
|
||||
default['php']['fpm_package'] = 'php7.4-fpm'
|
||||
default['php']['fpm_pooldir'] = '/etc/php/7.4/fpm/pool.d'
|
||||
default['php']['fpm_service'] = 'php7.4-fpm'
|
||||
default['php']['fpm_socket'] = '/var/run/php/php7.4-fpm.sock'
|
||||
default['php']['fpm_default_conf'] = '/etc/php/7.4/fpm/pool.d/www.conf'
|
||||
default['php']['fpm_conf_dir'] = '/etc/php/7.4/fpm'
|
||||
default['php']['enable_mod'] = '/usr/sbin/phpenmod'
|
||||
default['php']['disable_mod'] = '/usr/sbin/phpdismod'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.2/mods-available'
|
||||
default['php']['ext_conf_dir'] = '/etc/php/7.4/mods-available'
|
||||
end
|
||||
|
||||
case node['platform']
|
||||
when 'ubuntu'
|
||||
case node['platform_version'].to_f
|
||||
when 13.04..15.10
|
||||
default['php']['ext_conf_dir'] = '/etc/php5/mods-available'
|
||||
end
|
||||
when 'debian'
|
||||
if node['platform_version'].to_i == 8
|
||||
default['php']['ext_conf_dir'] = '/etc/php5/mods-available'
|
||||
end
|
||||
end
|
||||
when 'suse'
|
||||
default['php']['conf_dir'] = '/etc/php5/cli'
|
||||
default['php']['ext_conf_dir'] = '/etc/php5/conf.d'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng12-dev libssl-dev libt1-dev libxml2-devel libxslt-devel zlib-devel)
|
||||
default['php']['fpm_default_conf'] = '/etc/php-fpm.d/www.conf'
|
||||
default['php']['fpm_pooldir'] = '/etc/php5/fpm'
|
||||
default['php']['fpm_service'] = 'php-fpm'
|
||||
default['php']['fpm_package'] = 'php5-fpm'
|
||||
default['php']['fpm_user'] = 'wwwrun'
|
||||
default['php']['fpm_group'] = 'www'
|
||||
default['php']['fpm_listen_user'] = 'wwwrun'
|
||||
default['php']['fpm_listen_group'] = 'www'
|
||||
default['php']['packages'] = %w(apache2-mod_php5 php5-pear)
|
||||
lib_dir = node['kernel']['machine'] =~ /x86_64/ ? 'lib64' : 'lib'
|
||||
when 'freebsd'
|
||||
default['php']['conf_dir'] = '/usr/local/etc'
|
||||
default['php']['ext_conf_dir'] = '/usr/local/etc/php'
|
||||
default['php']['src_deps'] = %w(libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg62-dev libkrb5-dev libmcrypt-dev libpng12-dev libssl-dev libt1-dev)
|
||||
default['php']['fpm_user'] = 'www'
|
||||
default['php']['fpm_group'] = 'www'
|
||||
default['php']['fpm_listen_user'] = 'www'
|
||||
default['php']['fpm_listen_group'] = 'www'
|
||||
default['php']['packages'] = %w( php56 pear )
|
||||
end
|
||||
|
||||
default['php']['src_recompile'] = false
|
||||
|
||||
default['php']['configure_options'] = %W(--prefix=#{node['php']['prefix_dir']}
|
||||
--with-libdir=#{lib_dir}
|
||||
--with-config-file-path=#{node['php']['conf_dir']}
|
||||
|
||||
Reference in New Issue
Block a user