Merge pull request #133 from MurgaNikolay/master

Update agent_registration.rb
Added timeout setting and change version of zabbix_agent
Merge branch 'master' of github.com:laradji/zabbix
small fix
Install mod_php for Apache.
Refactor package management in web_apache recipe.

- Install ChefSpec via Bundler.
- Add missing specs for package management and refactor code.
- Sip a my coffee.
Merge pull request #134 from bjoernalbers/master

Install missing mod_php under Ubuntu 12.04
Initial support for super basic oracle connections

* Does not initialise anything
Add support for Oracle DB type
Clean up Berksfile and remove duplicate libcurl package installation
Whitespace cleanup in Berksfile
Fix typo when finding Zabbix server using node search
Make UserParameter configurable in zabbix_agentd.conf
Refactor UserParameter to make use of optional split config file, set default value.
Merge pull request #136 from holzweg/user_parameter

Make UserParameter configurable in zabbix_agentd.conf
Initial RHEL support for the Java gateway. Still to do :

* Finish Debian support (mainly init script)
* Get chef to notice when service is down and start up
Template item for Zabbix server was not working with dot syntax.
Converted to use hash-like syntax
Add Strainer use for test
Fix travis to use it.
Merge pull request #138 from optiflows-cookbooks/travis

Add Strainer use for test
Debian init script fixes & Install java JDK during server build

* Init script uses bash (instead of bourne shell "sh")
* Calls "java" default recipe