Skip to content
This repository was archived by the owner on Jun 30, 2020. It is now read-only.

Converge fork with main repo #34

Open
mlopes wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Converge fork with main repo #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3ee490c
Merge branch 'feature/xcache' into unstable/MSGD
mlopes Nov 22, 2012
c5abf0f
Merge branch 'feature/add-mbstring' into unstable/MSGD
mlopes Nov 22, 2012
3c71a88
Merge branch 'feature/xcache' into unstable/MSGD
mlopes Nov 22, 2012
581d902
Merge branch 'feature/fix-default-value-for-cacher-option' into unsta…
mlopes Nov 28, 2012
105a866
Merge branch 'feature/fix-zend_extension-bug-caused-by-ius-update' in…
mlopes Nov 28, 2012
06887cd
Merge remote-tracking branch 'upstream/master' into unstable/MSGD
mlopes Apr 24, 2013
369595f
Make memory_limit configurable
mlopes Apr 25, 2013
e1714dd
Merge branch 'feature/make-predis-compatible-with-redhat-family' into…
mlopes Apr 25, 2013
788013e
Merge branch 'feature/fix-package-names-for-redhat-family' into unsta…
mlopes Apr 25, 2013
d476427
Replace wrong php_pear provider with chef_php_extra_pear provider
mlopes Jul 19, 2013
1df5597
Update version of php codesnifer
mlopes Jul 19, 2013
a34cd95
Lock apt dependency version
mlopes Jul 19, 2013
9140149
Downgrade dependency on php cookbook to v1.1.0
mlopes Jul 22, 2013
bf4895e
Fix imagick recipe for redhat based distros
mlopes Sep 20, 2013
e67aa93
Merge remote-tracking branch 'inviqa/master' into unstable/MSGD
debo Nov 5, 2013
b457a95
Merge pull request #1 from MarcoDeBortoli/unstable/MSGD
mlopes Nov 5, 2013
927e110
Added two additional platforms to support as part of the redhat family
debo Nov 5, 2013
02c0c85
Bump version to 0.5.0
debo Nov 5, 2013
9e29bd9
Merge pull request #2 from MarcoDeBortoli/unstable/MSGD
mlopes Nov 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
default['xdebug']['profiler_output_dir'] = "/tmp/cachegrind"

default['php']['ius'] = "5.3"
default['php']['memory_limit'] = "128M"

default['xcache']['zend_extension'] = '/usr/lib64/php/modules/xcache.so'

Expand Down
6 changes: 3 additions & 3 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
license "Apache 2.0"
description "Installs/Configures additional PHP modules, PEAR and PECL packages"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.4.0"
version "0.5.0"

depends "git", ">= 1.0.0"
depends "yum", ">= 0.8.0"
depends "apt", ">= 1.8.4"
depends "php", "= 1.1.8"
depends "apt", "= 1.8.4"
depends "php", "= 1.1.0"
Copy link
Contributor

@alistairstead alistairstead Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure we need to revert to an older version of the opscode php cookbook?

Copy link

@debo debo Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's part of the Missguided customisation unfortunately. We could make it cleaner and use our project based Cheffile to ensure the expected project dependency. Would that be better?

Copy link
Contributor Author

@mlopes mlopes Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would that work as a solutions? This version of the chef-php-extra will depend on the php 1.1.8 cookbook, I don't think it will be possible to lock the cookbook to 1.1.0 with the Cheffile if one of the cookbooks requires a more recent version.

Copy link

@debo debo Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did the same yesterday with the dmg cookbooks while creating my VM if you remember

Copy link
Contributor Author

@mlopes mlopes Nov 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case the cookbook that required the dependency was not specifying the version of the dependency. Because of that, librarian-chef update was downloading the latest version, but we could still lock it to any other version.

depends "chef-php-extra"

%w{ ubuntu debian centos redhat fedora }.each do |os|
Expand Down
4 changes: 2 additions & 2 deletions recipes/PHP_CodeSniffer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
include_recipe "chef-php-extra::pear"

chef_php_extra_pear "PHP_CodeSniffer" do
version "1.3.5"
version "1.4.5"
action :install
end
end
2 changes: 1 addition & 1 deletion recipes/module_dev.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
end

pkgs = value_for_platform(
[ "centos", "redhat", "fedora" ] => {
[ "centos", "redhat", "fedora", "amazon", "scientific ] => {
"default" => packages
},
[ "debian", "ubuntu" ] => {
Expand Down
6 changes: 3 additions & 3 deletions recipes/module_imagick.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
packages = %w{ php54-imagick }
packages = %w{ php54-pecl-imagick }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-imagick }
packages = %w{ php53u-pecl-imagick }
else
packages = %w{ php-imagick }
packages = %w{ php-pecl-imagick }
end

pkgs = value_for_platform(
Expand Down
10 changes: 5 additions & 5 deletions templates/centos/php.ini.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
; If you use constants in your value, and these constants belong to a
; dynamically loaded extension (either a PHP extension or a Zend extension),
; you may only use these constants *after* the line that loads the extension.
;
;
;
;;;;;;;;;;;;;;;;;;;
; About this file ;
Expand Down Expand Up @@ -311,7 +311,7 @@ expose_php = On

max_execution_time = 30 ; Maximum execution time of each script, in seconds
max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
memory_limit = 128M ; Maximum amount of memory a script may consume
memory_limit = <%= @params['memory_limit'] %> ; Maximum amount of memory a script may consume


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -623,7 +623,7 @@ default_socket_timeout = 60
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.


;;;;
; Note: packaged extension modules are now loaded via the .ini files
; found in the directory /etc/php.d; these are loaded by default.
Expand Down Expand Up @@ -1064,7 +1064,7 @@ mssql.secure_connection = Off
; FreeTDS defaults to 4096
;mssql.max_procs = -1

; Specify client character set.
; Specify client character set.
; If empty or not set the client charset from freetds.comf is used
; This is only used when compiled with FreeTDS
;mssql.charset = "ISO-8859-1"
Expand Down Expand Up @@ -1212,7 +1212,7 @@ tidy.clean_output = Off
soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
soap.wsdl_cache_dir="/tmp"
; (time to live) Sets the number of second while cached file will be used
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
soap.wsdl_cache_ttl=86400

Expand Down
4 changes: 2 additions & 2 deletions templates/default/php.ini.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ max_input_time = 60

; Maximum amount of memory a script may consume (128MB)
; http://php.net/memory-limit
memory_limit = 128M
memory_limit = <%= @params['memory_limit'] %>

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Error handling and logging ;
Expand Down Expand Up @@ -1592,7 +1592,7 @@ session.entropy_length = 0
; Specified here to create the session id.
; http://php.net/session.entropy-file
; On systems that don't have /dev/urandom /dev/arandom can be used
; On windows, setting the entropy_length setting will activate the
; On windows, setting the entropy_length setting will activate the
; Windows random source (using the CryptoAPI)
;session.entropy_file = /dev/urandom

Expand Down
10 changes: 5 additions & 5 deletions templates/redhat/php.ini.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
; If you use constants in your value, and these constants belong to a
; dynamically loaded extension (either a PHP extension or a Zend extension),
; you may only use these constants *after* the line that loads the extension.
;
;
;
;;;;;;;;;;;;;;;;;;;
; About this file ;
Expand Down Expand Up @@ -311,7 +311,7 @@ expose_php = On

max_execution_time = 30 ; Maximum execution time of each script, in seconds
max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
memory_limit = 128M ; Maximum amount of memory a script may consume
memory_limit = <%= @params['memory_limit'] %> ; Maximum amount of memory a script may consume


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -623,7 +623,7 @@ default_socket_timeout = 60
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.


;;;;
; Note: packaged extension modules are now loaded via the .ini files
; found in the directory /etc/php.d; these are loaded by default.
Expand Down Expand Up @@ -1064,7 +1064,7 @@ mssql.secure_connection = Off
; FreeTDS defaults to 4096
;mssql.max_procs = -1

; Specify client character set.
; Specify client character set.
; If empty or not set the client charset from freetds.comf is used
; This is only used when compiled with FreeTDS
;mssql.charset = "ISO-8859-1"
Expand Down Expand Up @@ -1212,7 +1212,7 @@ tidy.clean_output = Off
soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
soap.wsdl_cache_dir="/tmp"
; (time to live) Sets the number of second while cached file will be used
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
soap.wsdl_cache_ttl=86400

Expand Down