diff --git a/CHANGELOG.md b/CHANGELOG.md index bf6c39a..3c3d962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,76 @@ +## 2.0.1 ## + +* Composer updated to 1.0.0-alpha10 (@alexmace) +* Add pspell extension (@alexmace) +* Fix bug in `php_require` and `php_fpm_require` functions (@sambauers) + +## 2.0.0 ## + +* Use Hiera for configs +* Allow configure params on PHP builds +* Add PThreads extension +* Update cardboard to 2.1.0 and update tests +* Add support for PHP 5.6+ +* Add insecure PHP version warnings +* Make Composer version configurable +* Remove version specific PHP classes allowing arbitrary PHP versions + +## 1.2.6 ## + +* Fix autoconf 2.13 sandboxing + +## 1.2.5 ## + +* Sandbox autoconf213 to fix some installation conflicts +* Set the PECL provider to default on darwin for PHP extensions (this can be overridden) +* Increase `pm.max_children` to 10 for PHP-FPM pools (@gblair) + +## 1.2.4 ## + +* Fixes compilation of PHP versions > 5.4.17 due to a break in Bison compatibility (@webflo!) + +## 1.2.3 ## + +* Add xhprof extension (@webflo) +* Add latest versions of PHP 5.4 and 5.5 (@webflo) + +## 1.2.2 ## + +* Change default .ini settings to increase timeouts, memory limits etc. + +## 1.2.1 ## + +* Bump Composer to latest 1.0.0-alpha8 (@webbj74) + +## 1.2.0 ## + +* Adds PHP 5.5 support! This requires a later version of Bison to compile, which is installed as a sandboxed package. +* Adds additional minor versions of PHP for 5.3 and 5.4 +* Use ensure_packages from the stdlib to improve module compatibility (thanks @jameydeorio) +* Fixes specs, and added Github API token to travis so builds actually work again + +## 1.1.5 ## + +* Add OAuth extension (@dbtlr) +* Fix HTTP extension bug including zookeeper (@dbtlr) +* Add Mongo extension (@eebs) +* Fix compilation bug caused by Freetype and GD incompatibilities (@eebs!) + +## 1.1.4 ## + +* Add memcache PHP extension (@poppen) +* Add pdo_pgsql PHP extension (@poppen) + +## 1.1.3 ## + +* Added support for Composer see the readme for usage. +* Module now has test specs (hooray!), please run script/cibuild before making a pull request. +* Fixes to bugs the specs caught + +## 1.1.2 ## + +* Increase xdebug `max_nesting_level` + ## 1.1.1 ## * Remove `libpng` package, add dependency on `libpng` module diff --git a/Gemfile b/Gemfile index b35fba7..acf5f45 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "cardboard", "~> 1.0" +gem "cardboard", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index f63f5ca..71e2460 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,80 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.5) + CFPropertyList (2.2.8) + addressable (2.3.6) ansi (1.4.3) - boxen (1.5.2) + boxen (2.7.0) ansi (~> 1.4) hiera (~> 1.0) highline (~> 1.6) json_pure (>= 1.7.7, < 2.0) - librarian-puppet (~> 0.9.9) - octokit (~> 1.15) - puppet (~> 3.0) - cardboard (1.0.4) - boxen (~> 1.0) + librarian-puppet (~> 1.0.0) + octokit (~> 2.7, >= 2.7.1) + puppet (~> 3.7) + cardboard (2.1.0) + boxen (~> 2.1) puppet-lint (~> 0.3) puppetlabs_spec_helper (~> 0.4) - rspec-puppet (~> 0.1) - diff-lcs (1.2.4) - facter (1.7.2) - faraday (0.8.8) - multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - hashie (2.0.5) - hiera (1.2.1) + rspec-puppet (~> 1.0) + diff-lcs (1.2.5) + facter (2.3.0) + CFPropertyList (~> 2.2.6) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hiera (1.3.4) json_pure - highline (1.6.19) - json (1.8.0) - json_pure (1.8.0) - librarian-puppet (0.9.10) - json + highline (1.6.21) + json (1.8.1) + json_pure (1.8.1) + librarian (0.1.2) + highline thor (~> 0.15) - metaclass (0.0.1) - mocha (0.14.0) + librarian-puppet (1.0.9) + json + librarian (>= 0.1.2) + metaclass (0.0.4) + mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.7.9) - multipart-post (1.2.0) - netrc (0.7.7) - octokit (1.25.0) - addressable (~> 2.2) - faraday (~> 0.8) - faraday_middleware (~> 0.9) - hashie (~> 2.0) - multi_json (~> 1.3) - netrc (~> 0.7.7) - puppet (3.2.4) - facter (~> 1.6) + multipart-post (2.0.0) + octokit (2.7.2) + sawyer (~> 0.5.2) + puppet (3.7.3) + facter (> 1.6, < 3) hiera (~> 1.0) - rgen (~> 0.6.5) + json_pure puppet-lint (0.3.2) - puppetlabs_spec_helper (0.4.1) - mocha (>= 0.10.5) + puppet-syntax (1.3.0) rake - rspec (>= 2.9.0) - rspec-puppet (>= 0.1.1) - rake (10.1.0) - rgen (0.6.5) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.5) - rspec-expectations (2.14.2) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.3) - rspec-puppet (0.1.6) + puppetlabs_spec_helper (0.8.2) + mocha + puppet-lint + puppet-syntax + rake + rspec + rspec-puppet + rake (10.3.2) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-puppet (1.0.1) rspec - thor (0.18.1) + rspec-support (3.1.2) + sawyer (0.5.5) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) + thor (0.19.1) PLATFORMS ruby DEPENDENCIES - cardboard (~> 1.0) + cardboard (~> 2.1) diff --git a/README.md b/README.md index 84efc29..7b055fd 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ The following boxen modules are required if optional PHP extensions are used: ```puppet # Install php 5.4 -include php::5_4 +php::version { '5.4': } # Install a couple of specific minor versions -include php::5_3_17 -include php::5_4_11 +php::version { '5.3.17': } +php::version { '5.4.11': } # Install Composer globally on your PATH include php::composer @@ -52,11 +52,11 @@ php::extension::apc { "apc for ${version}": } # Set up PHP-FPM as a service running a specific version of PHP -include php::fpm::5_3_15 +php::fpm { '5.3.15': } # Run multiple PHP-FPM services -include php::fpm::5_4_11 -include php::fpm::5_3_23 +php::fpm { '5.4.11': } +php::fpm { '5.3.23': } # Spin up a PHP-FPM pool for a project # Ensures: @@ -79,7 +79,7 @@ A sample PHP project manifest is provided in `manifests/project.pp` which will r A simple project manifest example: -````puppet +```puppet # your-boxen/modules/projects/manifests/trollin.pp class projects::trollin { @@ -93,10 +93,20 @@ class projects::trollin { php => '5.3.23', } } -```` +``` With the above, as long as our app is configured to listen to requests at `www/index.php` we can visit [http://trollin.dev/](http://trollin.dev/) to access the app. In the background this is installing PHP 5.3.23, creating a PHP-FPM service for 5.3.23, and a FPM pool for this project which runs within the FPM service. This then listens on an nginx socket at "#{ENV['BOXEN_SOCKET_DIR']}"/trollin. The example nginx host template at `templates/nginx/nginx.conf.erb` is also a sample configuration which can be copied to your main boxen module and the nginx template path above altered to match this. This is set up with a basic PHP structure, and Fastcgi params to pass the expected variables from Nginx to PHP-FPM. + +## Upgrading to version 2.X.X from version 1.X.X + +The old PHP version classes are removed completely in version 2. + +You will need to change any code in your manifests like `include PHP::5_X_X` to the version 2 equivalent `php::version { 5.X.X: }` + +All other classes remain unchanged in syntax, and should "just work". + +This module will now warn you if you are running an insecure version of PHP when you run Boxen. diff --git a/data/common.yaml b/data/common.yaml new file mode 100644 index 0000000..16cc19a --- /dev/null +++ b/data/common.yaml @@ -0,0 +1,19 @@ +--- +php::config::root: "%{::boxen::config::home}/phpenv" +php::config::logdir: "%{::boxen::config::logdir}/php" +php::config::configdir: "%{::boxen::config::configdir}/php" +php::config::datadir: "%{::boxen::config::datadir}/php" +php::config::pluginsdir: "%{php::config::root}/plugins" +php::config::cachedir: "%{php::config::datadir}/cache" +php::config::extensioncachedir: "%{php::config::datadir}/cache/extensions" +php::config::configure_params: {} +php::config::composer: + version: '1.0.0-alpha10' + checksum: 'dea8681b6f54dca9bb3a5b7deb179cca' +php::config::phpenv: + revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f' +php::config::secure_versions: + '5.6': '5.6.9' + '5.5': '5.5.25' + '5.4': '5.4.41' +php::config::secure_warning: true diff --git a/data/hiera.yaml b/data/hiera.yaml new file mode 100644 index 0000000..7e5202d --- /dev/null +++ b/data/hiera.yaml @@ -0,0 +1,3 @@ +--- +:hierarchy: + - common diff --git a/files/brews/autoconf213.rb b/files/brews/autoconf213.rb index 0026dc4..90a8d52 100644 --- a/files/brews/autoconf213.rb +++ b/files/brews/autoconf213.rb @@ -13,8 +13,8 @@ def install "--disable-dependency-tracking", "--program-suffix=213", "--prefix=#{prefix}", - "--infodir=#{info}", + "--infodir=#{info}/autoconf213", "--datadir=#{share}/autoconf213" system "make install" end -end \ No newline at end of file +end diff --git a/lib/puppet/parser/functions/php_fpm_require.rb b/lib/puppet/parser/functions/php_fpm_require.rb new file mode 100644 index 0000000..9fd83bf --- /dev/null +++ b/lib/puppet/parser/functions/php_fpm_require.rb @@ -0,0 +1,6 @@ +module Puppet::Parser::Functions + newfunction(:php_fpm_require) do |args| + Puppet::Parser::Functions.function('ensure_resource') + function_ensure_resource( [ 'php::fpm', args[0], {'ensure' => 'present'} ] ) + end +end diff --git a/lib/puppet/parser/functions/php_require.rb b/lib/puppet/parser/functions/php_require.rb new file mode 100644 index 0000000..3266d48 --- /dev/null +++ b/lib/puppet/parser/functions/php_require.rb @@ -0,0 +1,6 @@ +module Puppet::Parser::Functions + newfunction(:php_require) do |args| + Puppet::Parser::Functions.function('ensure_resource') + function_ensure_resource( [ 'php::version', args[0], {'ensure' => 'present'} ] ) + end +end diff --git a/lib/puppet/provider/php_extension/pecl.rb b/lib/puppet/provider/php_extension/pecl.rb index b0bcded..309d492 100644 --- a/lib/puppet/provider/php_extension/pecl.rb +++ b/lib/puppet/provider/php_extension/pecl.rb @@ -4,7 +4,7 @@ include Puppet::Util::Execution desc "Provides PHP extensions compiled from their pecl source code" - defaultfor :source => :pecl + defaultfor :operatingsystem => :darwin # Build and install our PHP extension def create diff --git a/lib/puppet/provider/php_version/php_source.rb b/lib/puppet/provider/php_version/php_source.rb index 96bf543..563164a 100644 --- a/lib/puppet/provider/php_version/php_source.rb +++ b/lib/puppet/provider/php_version/php_source.rb @@ -253,7 +253,6 @@ def get_configure_args(version, install_path, config_path) "--with-zlib=#{@resource[:homebrew_path]}/opt/zlibphp", "--with-snmp=/usr", "--with-libedit", - "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent", "--with-mhash", "--with-curl", "--with-openssl=/usr", @@ -267,7 +266,17 @@ def get_configure_args(version, install_path, config_path) ] # PHP-FPM isn't available until 5.3.3 - args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/) + if Gem::Version.new(@resource[:version]) > Gem::Version.new('5.3.2') + args << "--enable-fpm" + end + + # libevent was removed in 5.3.8 + if Gem::Version.new(@resource[:version]) < Gem::Version.new('5.3.8') + args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent" + end + + # User specified configure params + args << @resource[:configure_params] args end diff --git a/lib/puppet/type/php_extension.rb b/lib/puppet/type/php_extension.rb index d63ea19..800c76a 100644 --- a/lib/puppet/type/php_extension.rb +++ b/lib/puppet/type/php_extension.rb @@ -51,10 +51,6 @@ defaultto '' end - newparam(:source) do - defaultto :pecl - end - # Some PECL modules have a different module layout and the php extension # source in not in the root directory (e.g. xhprof) newparam(:extension_dir) do diff --git a/lib/puppet/type/php_version.rb b/lib/puppet/type/php_version.rb index 24f65d3..9678779 100644 --- a/lib/puppet/type/php_version.rb +++ b/lib/puppet/type/php_version.rb @@ -34,4 +34,8 @@ newparam(:user_home) do end + + newparam(:configure_params) do + defaultto '' + end end diff --git a/manifests/5_3.pp b/manifests/5_3.pp deleted file mode 100644 index 4103fd4..0000000 --- a/manifests/5_3.pp +++ /dev/null @@ -1,16 +0,0 @@ -# Installs php 5.3.27 and symlinks it as 5.3 -# -# Usage: -# -# include php::5_3 -# -class php::5_3 { - require php - require php::5_3_27 - - file { "${php::config::root}/versions/5.3": - ensure => symlink, - force => true, - target => "${php::config::root}/versions/5.3.27" - } -} diff --git a/manifests/5_3_10.pp b/manifests/5_3_10.pp deleted file mode 100644 index 4918af1..0000000 --- a/manifests/5_3_10.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.10 -# -# Usage: -# -# include php::5_3_10 -# -class php::5_3_10 { - php::version { '5.3.10': } -} diff --git a/manifests/5_3_11.pp b/manifests/5_3_11.pp deleted file mode 100644 index 42eaa3a..0000000 --- a/manifests/5_3_11.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.11 -# -# Usage: -# -# include php::5_3_11 -# -class php::5_3_11 { - php::version { '5.3.11': } -} diff --git a/manifests/5_3_12.pp b/manifests/5_3_12.pp deleted file mode 100644 index 309b94b..0000000 --- a/manifests/5_3_12.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.12 -# -# Usage: -# -# include php::5_3_12 -# -class php::5_3_12 { - php::version { '5.3.12': } -} diff --git a/manifests/5_3_13.pp b/manifests/5_3_13.pp deleted file mode 100644 index c20c86e..0000000 --- a/manifests/5_3_13.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.13 -# -# Usage: -# -# include php::5_3_13 -# -class php::5_3_13 { - php::version { '5.3.13': } -} diff --git a/manifests/5_3_14.pp b/manifests/5_3_14.pp deleted file mode 100644 index 89ffff4..0000000 --- a/manifests/5_3_14.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.14 -# -# Usage: -# -# include php::5_3_14 -# -class php::5_3_14 { - php::version { '5.3.14': } -} diff --git a/manifests/5_3_15.pp b/manifests/5_3_15.pp deleted file mode 100644 index e7203c1..0000000 --- a/manifests/5_3_15.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.15 -# -# Usage: -# -# include php::5_3_15 -# -class php::5_3_15 { - php::version { '5.3.15': } -} diff --git a/manifests/5_3_16.pp b/manifests/5_3_16.pp deleted file mode 100644 index 0ae9e60..0000000 --- a/manifests/5_3_16.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.16 -# -# Usage: -# -# include php::5_3_16 -# -class php::5_3_16 { - php::version { '5.3.16': } -} diff --git a/manifests/5_3_17.pp b/manifests/5_3_17.pp deleted file mode 100644 index fc7f760..0000000 --- a/manifests/5_3_17.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.17 -# -# Usage: -# -# include php::5_3_17 -# -class php::5_3_17 { - php::version { '5.3.17': } -} diff --git a/manifests/5_3_18.pp b/manifests/5_3_18.pp deleted file mode 100644 index c1fc5b1..0000000 --- a/manifests/5_3_18.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.18 -# -# Usage: -# -# include php::5_3_18 -# -class php::5_3_18 { - php::version { '5.3.18': } -} diff --git a/manifests/5_3_19.pp b/manifests/5_3_19.pp deleted file mode 100644 index f08693e..0000000 --- a/manifests/5_3_19.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.19 -# -# Usage: -# -# include php::5_3_19 -# -class php::5_3_19 { - php::version { '5.3.19': } -} diff --git a/manifests/5_3_2.pp b/manifests/5_3_2.pp deleted file mode 100644 index 5f4a78e..0000000 --- a/manifests/5_3_2.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.2 -# -# Usage: -# -# include php::5_3_2 -# -class php::5_3_2 { - php::version { '5.3.2': } -} diff --git a/manifests/5_3_20.pp b/manifests/5_3_20.pp deleted file mode 100644 index 4b80df7..0000000 --- a/manifests/5_3_20.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.20 -# -# Usage: -# -# include php::5_3_20 -# -class php::5_3_20 { - php::version { '5.3.20': } -} diff --git a/manifests/5_3_21.pp b/manifests/5_3_21.pp deleted file mode 100644 index ba3af38..0000000 --- a/manifests/5_3_21.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.21 -# -# Usage: -# -# include php::5_3_21 -# -class php::5_3_21 { - php::version { '5.3.21': } -} diff --git a/manifests/5_3_22.pp b/manifests/5_3_22.pp deleted file mode 100644 index a1c8aa3..0000000 --- a/manifests/5_3_22.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.22 -# -# Usage: -# -# include php::5_3_22 -# -class php::5_3_22 { - php::version { '5.3.22': } -} diff --git a/manifests/5_3_23.pp b/manifests/5_3_23.pp deleted file mode 100644 index 8570a31..0000000 --- a/manifests/5_3_23.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.23 -# -# Usage: -# -# include php::5_3_23 -# -class php::5_3_23 { - php::version { '5.3.23': } -} diff --git a/manifests/5_3_24.pp b/manifests/5_3_24.pp deleted file mode 100644 index fa01f53..0000000 --- a/manifests/5_3_24.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.24 -# -# Usage: -# -# include php::5_3_24 -# -class php::5_3_24 { - php::version { '5.3.24': } -} diff --git a/manifests/5_3_25.pp b/manifests/5_3_25.pp deleted file mode 100644 index 6f0ce64..0000000 --- a/manifests/5_3_25.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.25 -# -# Usage: -# -# include php::5_3_25 -# -class php::5_3_25 { - php::version { '5.3.25': } -} diff --git a/manifests/5_3_26.pp b/manifests/5_3_26.pp deleted file mode 100644 index cd38fc7..0000000 --- a/manifests/5_3_26.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.26 -# -# Usage: -# -# include php::5_3_26 -# -class php::5_3_26 { - php::version { '5.3.26': } -} diff --git a/manifests/5_3_27.pp b/manifests/5_3_27.pp deleted file mode 100644 index 93f9778..0000000 --- a/manifests/5_3_27.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.27 -# -# Usage: -# -# include php::5_3_27 -# -class php::5_3_27 { - php::version { '5.3.27': } -} diff --git a/manifests/5_3_28.pp b/manifests/5_3_28.pp deleted file mode 100644 index f03918d..0000000 --- a/manifests/5_3_28.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.28 -# -# Usage: -# -# include php::5_3_28 -# -class php::5_3_28 { - php::version { '5.3.28': } -} diff --git a/manifests/5_3_3.pp b/manifests/5_3_3.pp deleted file mode 100644 index 560a0e2..0000000 --- a/manifests/5_3_3.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.3 -# -# Usage: -# -# include php::5_3_3 -# -class php::5_3_3 { - php::version { '5.3.3': } -} diff --git a/manifests/5_3_4.pp b/manifests/5_3_4.pp deleted file mode 100644 index 61abf7e..0000000 --- a/manifests/5_3_4.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.4 -# -# Usage: -# -# include php::5_3_4 -# -class php::5_3_4 { - php::version { '5.3.4': } -} diff --git a/manifests/5_3_5.pp b/manifests/5_3_5.pp deleted file mode 100644 index af26197..0000000 --- a/manifests/5_3_5.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.5 -# -# Usage: -# -# include php::5_3_5 -# -class php::5_3_5 { - php::version { '5.3.5': } -} diff --git a/manifests/5_3_6.pp b/manifests/5_3_6.pp deleted file mode 100644 index e07efc0..0000000 --- a/manifests/5_3_6.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.6 -# -# Usage: -# -# include php::5_3_6 -# -class php::5_3_6 { - php::version { '5.3.6': } -} diff --git a/manifests/5_3_7.pp b/manifests/5_3_7.pp deleted file mode 100644 index b7d6945..0000000 --- a/manifests/5_3_7.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.7 -# -# Usage: -# -# include php::5_3_7 -# -class php::5_3_7 { - php::version { '5.3.7': } -} diff --git a/manifests/5_3_8.pp b/manifests/5_3_8.pp deleted file mode 100644 index 75e550f..0000000 --- a/manifests/5_3_8.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.8 -# -# Usage: -# -# include php::5_3_8 -# -class php::5_3_8 { - php::version { '5.3.8': } -} diff --git a/manifests/5_3_9.pp b/manifests/5_3_9.pp deleted file mode 100644 index 5465f54..0000000 --- a/manifests/5_3_9.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.3.9 -# -# Usage: -# -# include php::5_3_9 -# -class php::5_3_9 { - php::version { '5.3.9': } -} diff --git a/manifests/5_4.pp b/manifests/5_4.pp deleted file mode 100644 index 06573bc..0000000 --- a/manifests/5_4.pp +++ /dev/null @@ -1,16 +0,0 @@ -# Installs php 5.4.17 and symlinks it as 5.4 -# -# Usage: -# -# include php::5_4 -# -class php::5_4 { - require php - require php::5_4_17 - - file { "${php::config::root}/versions/5.4": - ensure => symlink, - force => true, - target => "${php::config::root}/versions/5.4.17" - } -} diff --git a/manifests/5_4_0.pp b/manifests/5_4_0.pp deleted file mode 100644 index 88e86ee..0000000 --- a/manifests/5_4_0.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.0 -# -# Usage: -# -# include php::5_4_0 -# -class php::5_4_0 { - php::version { '5.4.0': } -} diff --git a/manifests/5_4_1.pp b/manifests/5_4_1.pp deleted file mode 100644 index 9498d2c..0000000 --- a/manifests/5_4_1.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.1 -# -# Usage: -# -# include php::5_4_1 -# -class php::5_4_1 { - php::version { '5.4.1': } -} diff --git a/manifests/5_4_10.pp b/manifests/5_4_10.pp deleted file mode 100644 index 7f0c133..0000000 --- a/manifests/5_4_10.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.10 -# -# Usage: -# -# include php::5_4_10 -# -class php::5_4_10 { - php::version { '5.4.10': } -} diff --git a/manifests/5_4_11.pp b/manifests/5_4_11.pp deleted file mode 100644 index 544a9c6..0000000 --- a/manifests/5_4_11.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.11 -# -# Usage: -# -# include php::5_4_11 -# -class php::5_4_11 { - php::version { '5.4.11': } -} diff --git a/manifests/5_4_12.pp b/manifests/5_4_12.pp deleted file mode 100644 index 09fa831..0000000 --- a/manifests/5_4_12.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.12 -# -# Usage: -# -# include php::5_4_12 -# -class php::5_4_12 { - php::version { '5.4.12': } -} diff --git a/manifests/5_4_13.pp b/manifests/5_4_13.pp deleted file mode 100644 index 98e2066..0000000 --- a/manifests/5_4_13.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.13 -# -# Usage: -# -# include php::5_4_13 -# -class php::5_4_13 { - php::version { '5.4.13': } -} diff --git a/manifests/5_4_14.pp b/manifests/5_4_14.pp deleted file mode 100644 index 996d761..0000000 --- a/manifests/5_4_14.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.14 -# -# Usage: -# -# include php::5_4_14 -# -class php::5_4_14 { - php::version { '5.4.14': } -} diff --git a/manifests/5_4_15.pp b/manifests/5_4_15.pp deleted file mode 100644 index 1ff2f16..0000000 --- a/manifests/5_4_15.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.15 -# -# Usage: -# -# include php::5_4_15 -# -class php::5_4_15 { - php::version { '5.4.15': } -} diff --git a/manifests/5_4_16.pp b/manifests/5_4_16.pp deleted file mode 100644 index 2f12194..0000000 --- a/manifests/5_4_16.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.16 -# -# Usage: -# -# include php::5_4_16 -# -class php::5_4_16 { - php::version { '5.4.16': } -} diff --git a/manifests/5_4_17.pp b/manifests/5_4_17.pp deleted file mode 100644 index c01d1b5..0000000 --- a/manifests/5_4_17.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.17 -# -# Usage: -# -# include php::5_4_17 -# -class php::5_4_17 { - php::version { '5.4.17': } -} diff --git a/manifests/5_4_18.pp b/manifests/5_4_18.pp deleted file mode 100644 index b7d77ce..0000000 --- a/manifests/5_4_18.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.18 -# -# Usage: -# -# include php::5_4_18 -# -class php::5_4_18 { - php::version { '5.4.18': } -} diff --git a/manifests/5_4_19.pp b/manifests/5_4_19.pp deleted file mode 100644 index 796d557..0000000 --- a/manifests/5_4_19.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.19 -# -# Usage: -# -# include php::5_4_19 -# -class php::5_4_19 { - php::version { '5.4.19': } -} diff --git a/manifests/5_4_2.pp b/manifests/5_4_2.pp deleted file mode 100644 index bf7a3bf..0000000 --- a/manifests/5_4_2.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.2 -# -# Usage: -# -# include php::5_4_2 -# -class php::5_4_2 { - php::version { '5.4.2': } -} diff --git a/manifests/5_4_20.pp b/manifests/5_4_20.pp deleted file mode 100644 index 879075b..0000000 --- a/manifests/5_4_20.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.20 -# -# Usage: -# -# include php::5_4_20 -# -class php::5_4_20 { - php::version { '5.4.20': } -} diff --git a/manifests/5_4_21.pp b/manifests/5_4_21.pp deleted file mode 100644 index cf16599..0000000 --- a/manifests/5_4_21.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.21 -# -# Usage: -# -# include php::5_4_21 -# -class php::5_4_21 { - php::version { '5.4.21': } -} diff --git a/manifests/5_4_22.pp b/manifests/5_4_22.pp deleted file mode 100644 index c6dd850..0000000 --- a/manifests/5_4_22.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.22 -# -# Usage: -# -# include php::5_4_22 -# -class php::5_4_22 { - php::version { '5.4.22': } -} diff --git a/manifests/5_4_23.pp b/manifests/5_4_23.pp deleted file mode 100644 index 81973bc..0000000 --- a/manifests/5_4_23.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.23 -# -# Usage: -# -# include php::5_4_23 -# -class php::5_4_23 { - php::version { '5.4.23': } -} diff --git a/manifests/5_4_24.pp b/manifests/5_4_24.pp deleted file mode 100644 index 9f6f9df..0000000 --- a/manifests/5_4_24.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.24 -# -# Usage: -# -# include php::5_4_24 -# -class php::5_4_24 { - php::version { '5.4.24': } -} diff --git a/manifests/5_4_25.pp b/manifests/5_4_25.pp deleted file mode 100644 index ad6df9f..0000000 --- a/manifests/5_4_25.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.25 -# -# Usage: -# -# include php::5_4_25 -# -class php::5_4_25 { - php::version { '5.4.25': } -} diff --git a/manifests/5_4_26.pp b/manifests/5_4_26.pp deleted file mode 100644 index e76eca6..0000000 --- a/manifests/5_4_26.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.26 -# -# Usage: -# -# include php::5_4_26 -# -class php::5_4_26 { - php::version { '5.4.26': } -} diff --git a/manifests/5_4_27.pp b/manifests/5_4_27.pp deleted file mode 100644 index 926be35..0000000 --- a/manifests/5_4_27.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.27 -# -# Usage: -# -# include php::5_4_27 -# -class php::5_4_27 { - php::version { '5.4.27': } -} diff --git a/manifests/5_4_28.pp b/manifests/5_4_28.pp deleted file mode 100644 index 6565ddb..0000000 --- a/manifests/5_4_28.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.28 -# -# Usage: -# -# include php::5_4_28 -# -class php::5_4_28 { - php::version { '5.4.28': } -} diff --git a/manifests/5_4_29.pp b/manifests/5_4_29.pp deleted file mode 100644 index 0d37727..0000000 --- a/manifests/5_4_29.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.29 -# -# Usage: -# -# include php::5_4_29 -# -class php::5_4_29 { - php::version { '5.4.29': } -} diff --git a/manifests/5_4_3.pp b/manifests/5_4_3.pp deleted file mode 100644 index 6af6eba..0000000 --- a/manifests/5_4_3.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.3 -# -# Usage: -# -# include php::5_4_3 -# -class php::5_4_3 { - php::version { '5.4.3': } -} diff --git a/manifests/5_4_4.pp b/manifests/5_4_4.pp deleted file mode 100644 index 91bfdf1..0000000 --- a/manifests/5_4_4.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.4 -# -# Usage: -# -# include php::5_4_4 -# -class php::5_4_4 { - php::version { '5.4.4': } -} diff --git a/manifests/5_4_5.pp b/manifests/5_4_5.pp deleted file mode 100644 index 1248dab..0000000 --- a/manifests/5_4_5.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.5 -# -# Usage: -# -# include php::5_4_5 -# -class php::5_4_5 { - php::version { '5.4.5': } -} diff --git a/manifests/5_4_6.pp b/manifests/5_4_6.pp deleted file mode 100644 index 012ab77..0000000 --- a/manifests/5_4_6.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.6 -# -# Usage: -# -# include php::5_4_6 -# -class php::5_4_6 { - php::version { '5.4.6': } -} diff --git a/manifests/5_4_7.pp b/manifests/5_4_7.pp deleted file mode 100644 index 4a73a17..0000000 --- a/manifests/5_4_7.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.7 -# -# Usage: -# -# include php::5_4_7 -# -class php::5_4_7 { - php::version { '5.4.7': } -} diff --git a/manifests/5_4_8.pp b/manifests/5_4_8.pp deleted file mode 100644 index 9bb5929..0000000 --- a/manifests/5_4_8.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.8 -# -# Usage: -# -# include php::5_4_8 -# -class php::5_4_8 { - php::version { '5.4.8': } -} diff --git a/manifests/5_4_9.pp b/manifests/5_4_9.pp deleted file mode 100644 index 1fad8c8..0000000 --- a/manifests/5_4_9.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Installs php 5.4.9 -# -# Usage: -# -# include php::5_4_9 -# -class php::5_4_9 { - php::version { '5.4.9': } -} diff --git a/manifests/5_5.pp b/manifests/5_5.pp deleted file mode 100644 index db4440e..0000000 --- a/manifests/5_5.pp +++ /dev/null @@ -1,15 +0,0 @@ -# Installs php 5.5.0 and symlinks it as 5.5 -# -# Usage: -# -# include php::5-5 -class php::5_5 { - require php - require php::5_5_0 - - file { "${php::config::root}/versions/5.5": - ensure => symlink, - force => true, - target => "${php::root}/versions/5.5.0" - } -} diff --git a/manifests/5_5_0.pp b/manifests/5_5_0.pp deleted file mode 100644 index 00dbf66..0000000 --- a/manifests/5_5_0.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.0 -# -# Usage: -# -# include php::5_5_0 -class php::5_5_0 { - php::version { '5.5.0': } -} diff --git a/manifests/5_5_1.pp b/manifests/5_5_1.pp deleted file mode 100644 index 7174e6a..0000000 --- a/manifests/5_5_1.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.1 -# -# Usage: -# -# include php::5_5_1 -class php::5_5_1 { - php::version { '5.5.1': } -} diff --git a/manifests/5_5_10.pp b/manifests/5_5_10.pp deleted file mode 100644 index ddfa44d..0000000 --- a/manifests/5_5_10.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.10 -# -# Usage: -# -# include php::5_5_10 -class php::5_5_10 { - php::version { '5.5.10': } -} diff --git a/manifests/5_5_11.pp b/manifests/5_5_11.pp deleted file mode 100644 index 8773472..0000000 --- a/manifests/5_5_11.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.11 -# -# Usage: -# -# include php::5_5_11 -class php::5_5_11 { - php::version { '5.5.11': } -} diff --git a/manifests/5_5_12.pp b/manifests/5_5_12.pp deleted file mode 100644 index 7659c6d..0000000 --- a/manifests/5_5_12.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.12 -# -# Usage: -# -# include php::5_5_12 -class php::5_5_12 { - php::version { '5.5.12': } -} diff --git a/manifests/5_5_13.pp b/manifests/5_5_13.pp deleted file mode 100644 index 82ca3a4..0000000 --- a/manifests/5_5_13.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.13 -# -# Usage: -# -# include php::5_5_13 -class php::5_5_13 { - php::version { '5.5.13': } -} diff --git a/manifests/5_5_14.pp b/manifests/5_5_14.pp deleted file mode 100644 index cd06609..0000000 --- a/manifests/5_5_14.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.14 -# -# Usage: -# -# include php::5_5_14 -class php::5_5_14 { - php::version { '5.5.14': } -} diff --git a/manifests/5_5_15.pp b/manifests/5_5_15.pp deleted file mode 100644 index 1232749..0000000 --- a/manifests/5_5_15.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.15 -# -# Usage: -# -# include php::5_5_15 -class php::5_5_15 { - php::version { '5.5.15': } -} diff --git a/manifests/5_5_16.pp b/manifests/5_5_16.pp deleted file mode 100644 index f002883..0000000 --- a/manifests/5_5_16.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.16 -# -# Usage: -# -# include php::5_5_16 -class php::5_5_16 { - php::version { '5.5.16': } -} diff --git a/manifests/5_5_2.pp b/manifests/5_5_2.pp deleted file mode 100644 index c960f29..0000000 --- a/manifests/5_5_2.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.2 -# -# Usage: -# -# include php::5_5_2 -class php::5_5_2 { - php::version { '5.5.2': } -} diff --git a/manifests/5_5_3.pp b/manifests/5_5_3.pp deleted file mode 100644 index 8cde17c..0000000 --- a/manifests/5_5_3.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.3 -# -# Usage: -# -# include php::5_5_3 -class php::5_5_3 { - php::version { '5.5.3': } -} diff --git a/manifests/5_5_4.pp b/manifests/5_5_4.pp deleted file mode 100644 index 8b96952..0000000 --- a/manifests/5_5_4.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.4 -# -# Usage: -# -# include php::5_5_4 -class php::5_5_4 { - php::version { '5.5.4': } -} diff --git a/manifests/5_5_5.pp b/manifests/5_5_5.pp deleted file mode 100644 index b36da82..0000000 --- a/manifests/5_5_5.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.5 -# -# Usage: -# -# include php::5_5_5 -class php::5_5_5 { - php::version { '5.5.5': } -} diff --git a/manifests/5_5_6.pp b/manifests/5_5_6.pp deleted file mode 100644 index 8696454..0000000 --- a/manifests/5_5_6.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.6 -# -# Usage: -# -# include php::5_5_6 -class php::5_5_6 { - php::version { '5.5.6': } -} diff --git a/manifests/5_5_7.pp b/manifests/5_5_7.pp deleted file mode 100644 index a5b1d78..0000000 --- a/manifests/5_5_7.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.7 -# -# Usage: -# -# include php::5_5_7 -class php::5_5_7 { - php::version { '5.5.7': } -} diff --git a/manifests/5_5_8.pp b/manifests/5_5_8.pp deleted file mode 100644 index 88da5bb..0000000 --- a/manifests/5_5_8.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.8 -# -# Usage: -# -# include php::5_5_8 -class php::5_5_8 { - php::version { '5.5.8': } -} diff --git a/manifests/5_5_9.pp b/manifests/5_5_9.pp deleted file mode 100644 index 9f4bd4e..0000000 --- a/manifests/5_5_9.pp +++ /dev/null @@ -1,8 +0,0 @@ -# Installs php 5.5.9 -# -# Usage: -# -# include php::5_5_9 -class php::5_5_9 { - php::version { '5.5.9': } -} diff --git a/manifests/composer.pp b/manifests/composer.pp index 2dbfb9a..d898121 100644 --- a/manifests/composer.pp +++ b/manifests/composer.pp @@ -7,14 +7,35 @@ class php::composer { require php + # Get composer config + $test_params = $php::config::composer + if is_hash($test_params) { + if has_key($test_params, 'version') { + $composer_version = $test_params['version'] + $composer_url = "https://getcomposer.org/download/${composer_version}/composer.phar" + } + if has_key($test_params, 'checksum') { + $composer_checksum = $test_params['checksum'] + } + } + + if empty($composer_version) { + err('No Composer version has been specified. Cannot install Composer.') + } + if empty($composer_checksum) { + err('No Composer checksum has been specified. Cannot install Composer.') + } + + $composer_path = "${php::config::root}/bin/composer" + exec { 'download-php-composer': - command => "curl -sS -o ${php::config::root}/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar", - unless => "[ -f ${php::config::root}/bin/composer ] && [ \"`md5 -q ${php::config::root}/bin/composer`\" = \"df1001975035f07d09307bf1f1e62584\" ]", + command => "curl -sS -o ${composer_path} ${composer_url}", + unless => "[ -f ${composer_path} ] && [ \"`md5 -q ${composer_path}`\" = \"${composer_checksum}\" ]", cwd => $php::config::root, require => Exec['phpenv-setup-root-repo'] } -> - file { "${php::config::root}/bin/composer": + file { $composer_path: mode => '0755' } } diff --git a/manifests/config.pp b/manifests/config.pp index 3bb8d1c..c55a6a2 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -4,14 +4,40 @@ # # include php::config # -class php::config { - require boxen::config +class php::config( + $root = undef, + $logdir = undef, + $configdir = undef, + $datadir = undef, + $pluginsdir = undef, + $cachedir = undef, + $extensioncachedir = undef, + $configure_params = undef, + $composer = undef, + $phpenv = undef, + $secure_versions = undef, + $secure_warning = undef, +) { + include boxen::config - $root = "${boxen::config::home}/phpenv" - $logdir = "${boxen::config::logdir}/php" - $configdir = "${boxen::config::configdir}/php" - $datadir = "${boxen::config::datadir}/php" - $pluginsdir = "${root}/plugins" - $cachedir = "${php::config::datadir}/cache" - $extensioncachedir = "${php::config::datadir}/cache/extensions" + validate_string( + $root, + $logdir, + $configdir, + $datadir, + $pluginsdir, + $cachedir, + $extensioncachedir, + ) + + validate_hash( + $configure_params, + $composer, + $phpenv, + $secure_versions, + ) + + validate_bool( + $secure_warning, + ) } diff --git a/manifests/extension/apc.pp b/manifests/extension/apc.pp index d056873..90776e6 100644 --- a/manifests/extension/apc.pp +++ b/manifests/extension/apc.pp @@ -14,7 +14,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'apc' $package_name = "APC-${version}" diff --git a/manifests/extension/couchbase.pp b/manifests/extension/couchbase.pp index ba6969a..c8542a8 100644 --- a/manifests/extension/couchbase.pp +++ b/manifests/extension/couchbase.pp @@ -16,7 +16,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'couchbase' diff --git a/manifests/extension/imagick.pp b/manifests/extension/imagick.pp index d34428c..1e26a96 100644 --- a/manifests/extension/imagick.pp +++ b/manifests/extension/imagick.pp @@ -16,7 +16,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'imagick' $package_name = "imagick-${version}" diff --git a/manifests/extension/intl.pp b/manifests/extension/intl.pp index 9d1a2ff..d6e41f2 100644 --- a/manifests/extension/intl.pp +++ b/manifests/extension/intl.pp @@ -15,7 +15,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'intl' $package_name = "intl-${version}" diff --git a/manifests/extension/mcrypt.pp b/manifests/extension/mcrypt.pp index 8c7d666..ab40e3f 100644 --- a/manifests/extension/mcrypt.pp +++ b/manifests/extension/mcrypt.pp @@ -13,7 +13,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'mcrypt' diff --git a/manifests/extension/memcache.pp b/manifests/extension/memcache.pp index 0a41a6d..3cdbf67 100644 --- a/manifests/extension/memcache.pp +++ b/manifests/extension/memcache.pp @@ -16,7 +16,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'memcache' diff --git a/manifests/extension/memcached.pp b/manifests/extension/memcached.pp index 331f055..edd1046 100644 --- a/manifests/extension/memcached.pp +++ b/manifests/extension/memcached.pp @@ -17,7 +17,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'memcached' diff --git a/manifests/extension/mongo.pp b/manifests/extension/mongo.pp index c9021ed..d9c7035 100644 --- a/manifests/extension/mongo.pp +++ b/manifests/extension/mongo.pp @@ -14,7 +14,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'mongo' $package_name = "mongo-${version}" diff --git a/manifests/extension/mssql.pp b/manifests/extension/mssql.pp index 7b94d38..e27ad5c 100644 --- a/manifests/extension/mssql.pp +++ b/manifests/extension/mssql.pp @@ -14,7 +14,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'mssql' diff --git a/manifests/extension/oauth.pp b/manifests/extension/oauth.pp index e1e7999..d8c84e8 100644 --- a/manifests/extension/oauth.pp +++ b/manifests/extension/oauth.pp @@ -14,7 +14,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'oauth' $package_name = "oauth-${version}" diff --git a/manifests/extension/pdo_dblib.pp b/manifests/extension/pdo_dblib.pp index 255c705..0b70a2b 100644 --- a/manifests/extension/pdo_dblib.pp +++ b/manifests/extension/pdo_dblib.pp @@ -14,7 +14,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'pdo_dblib' diff --git a/manifests/extension/pdo_pgsql.pp b/manifests/extension/pdo_pgsql.pp index a0dd825..8592065 100644 --- a/manifests/extension/pdo_pgsql.pp +++ b/manifests/extension/pdo_pgsql.pp @@ -13,7 +13,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'pdo_pgsql' diff --git a/manifests/extension/pecl_http.pp b/manifests/extension/pecl_http.pp index 3269dbb..c563cac 100644 --- a/manifests/extension/pecl_http.pp +++ b/manifests/extension/pecl_http.pp @@ -16,7 +16,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'pecl_http' $package_name = "pecl_http-${version}" diff --git a/manifests/extension/pgsql.pp b/manifests/extension/pgsql.pp index 597ad28..4e5c7eb 100644 --- a/manifests/extension/pgsql.pp +++ b/manifests/extension/pgsql.pp @@ -13,7 +13,7 @@ # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'pgsql' diff --git a/manifests/extension/pspell.pp b/manifests/extension/pspell.pp new file mode 100644 index 0000000..c1f8830 --- /dev/null +++ b/manifests/extension/pspell.pp @@ -0,0 +1,45 @@ +# Installs the pspell extension for a specific version of php. +# +# Usage: +# +# php::extension::pspell { 'pspell for 5.4.10': +# php => '5.4.10' +# } +# +define php::extension::pspell( + $php, +) { + require php::config + require aspell + + # Ensure that the specified version of PHP is installed. + php_require($php) + + $extension = 'pspell' + + # Final module install path + $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so" + + # Additional options + $configure_params = "--with-pspell=${boxen::config::homebrewdir}/opt/aspell" + + php_extension { $name: + provider => php_source, + + extension => $extension, + + homebrew_path => $boxen::config::homebrewdir, + phpenv_root => $php::config::root, + php_version => $php, + + configure_params => $configure_params, + } + + # Add config file once extension is installed + + file { "${php::config::configdir}/${php}/conf.d/${extension}.ini": + content => template('php/extensions/generic.ini.erb'), + require => Php_extension[$name], + } + +} diff --git a/manifests/extension/pthreads.pp b/manifests/extension/pthreads.pp new file mode 100644 index 0000000..4184919 --- /dev/null +++ b/manifests/extension/pthreads.pp @@ -0,0 +1,52 @@ +# Installs the pthreads extension for a specific version of php. +# +# Requires PHP to be built with thread safety, add: +# +# php::config::configure_params: +# 5.5.18: '--enable-maintainer-zts' +# +# or similar to Hiera configs in your Boxen repo (adjust for your version). +# +# Usage: +# +# php::extension::pthreads { 'pthreads for 5.5.18': +# php => '5.5.18', +# version => '2.0.10' +# } +# +define php::extension::pthreads( + $php, + $version = '2.0.10', +) { + require php::config + + # Require php version eg. php::5_4_10 + # This will compile, install and set up config dirs if not present + php_require($php) + + $extension = 'pthreads' + $package_name = "pthreads-${version}" + $url = "http://pecl.php.net/get/pthreads-${version}.tgz" + + # Final module install path + $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so" + + php_extension { $name: + extension => $extension, + version => $version, + package_name => $package_name, + package_url => $url, + homebrew_path => $boxen::config::homebrewdir, + phpenv_root => $php::config::root, + php_version => $php, + provider => pecl, + } + + # Add config file once extension is installed + + file { "${php::config::configdir}/${php}/conf.d/${extension}.ini": + content => template('php/extensions/generic.ini.erb'), + require => Php_extension[$name], + } + +} diff --git a/manifests/extension/redis.pp b/manifests/extension/redis.pp index 31f94a8..d3359a4 100644 --- a/manifests/extension/redis.pp +++ b/manifests/extension/redis.pp @@ -16,7 +16,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'redis' diff --git a/manifests/extension/ssh2.pp b/manifests/extension/ssh2.pp new file mode 100644 index 0000000..b6f0549 --- /dev/null +++ b/manifests/extension/ssh2.pp @@ -0,0 +1,52 @@ +# Installs a php extension for a specific version of php. +# +# Usage: +# +# php::extension::ssh2 { 'ssh2 for 5.4.10': +# version => '0.12' +# php => '5.4.10', +# } +# +define php::extension::ssh2( + $php, + $version = '0.12' +) { + require php::config + # Require php version eg. php::5_4_10 + # This will compile, install and set up config dirs if not present + php_require($php) + + package { 'libssh2': } + + $extension = 'ssh2' + $package_name = "ssh2-${version}" + $url = "http://pecl.php.net/get/ssh2-${version}.tgz" + + # Final module install path + $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so" + + # Additional options + $configure_params = "--with-ssh2=${boxen::config::homebrewdir}/opt/libssh2" + + php_extension { $name: + extension => $extension, + version => $version, + package_name => $package_name, + package_url => $url, + homebrew_path => $boxen::config::homebrewdir, + phpenv_root => $php::config::root, + php_version => $php, + cache_dir => $php::config::extensioncachedir, + provider => pecl, + configure_params => $configure_params, + require => Package['libssh2'], + } + + # Add config file once extension is installed + + file { "${php::config::configdir}/${php}/conf.d/${extension}.ini": + content => template('php/extensions/generic.ini.erb'), + require => Php_extension[$name], + } + +} diff --git a/manifests/extension/stats.pp b/manifests/extension/stats.pp new file mode 100644 index 0000000..5af61a9 --- /dev/null +++ b/manifests/extension/stats.pp @@ -0,0 +1,44 @@ +# Installs the stats extension for a specific version of php. +# +# Usage: +# +# php::extension::stats { 'stats for 5.4.10': +# php => '5.4.10', +# version => '1.0.3' +# } +# +define php::extension::stats( + $php, + $version = '1.0.3' +) { + require php::config + # Require php version eg. php::5_4_10 + # This will compile, install and set up config dirs if not present + php_require($php) + + $extension = 'stats' + $package_name = "stats-${version}" + $url = "http://pecl.php.net/get/stats-${version}.tgz" + + # Final module install path + $module_path = "${php::config::root}/versions/${php}/modules/${extension}.so" + + php_extension { $name: + extension => $extension, + version => $version, + package_name => $package_name, + package_url => $url, + homebrew_path => $boxen::config::homebrewdir, + phpenv_root => $php::config::root, + php_version => $php, + cache_dir => $php::config::extensioncachedir, + } + + # Add config file once extension is installed + + file { "${php::config::configdir}/${php}/conf.d/${extension}.ini": + content => template('php/extensions/generic.ini.erb'), + require => Php_extension[$name], + } + +} diff --git a/manifests/extension/xdebug.pp b/manifests/extension/xdebug.pp index bd27986..d9ffe1b 100644 --- a/manifests/extension/xdebug.pp +++ b/manifests/extension/xdebug.pp @@ -14,7 +14,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'xdebug' $package_name = "xdebug-${version}" diff --git a/manifests/extension/xhprof.pp b/manifests/extension/xhprof.pp index b0d1efd..7ed7846 100644 --- a/manifests/extension/xhprof.pp +++ b/manifests/extension/xhprof.pp @@ -15,7 +15,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'xhprof' $package_name = "xhprof-${version}" diff --git a/manifests/extension/zmq.pp b/manifests/extension/zmq.pp index f4c0405..96af6cf 100644 --- a/manifests/extension/zmq.pp +++ b/manifests/extension/zmq.pp @@ -16,7 +16,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'zmq' diff --git a/manifests/extension/zookeeper.pp b/manifests/extension/zookeeper.pp index 26247e0..236943d 100644 --- a/manifests/extension/zookeeper.pp +++ b/manifests/extension/zookeeper.pp @@ -17,7 +17,7 @@ require php::config # Require php version eg. php::5_4_10 # This will compile, install and set up config dirs if not present - require join(['php', join(split($php, '[.]'), '_')], '::') + php_require($php) $extension = 'zookeeper' $package_name = "zookeeper-${version}" diff --git a/manifests/fpm.pp b/manifests/fpm.pp index 61dc30b..6d5ae6d 100644 --- a/manifests/fpm.pp +++ b/manifests/fpm.pp @@ -4,39 +4,51 @@ # # php::fpm { '5.4.10': } # -# You'll probably be better off using a specific fpm class as this -# will allow the class to be defined multiple times. For example if -# you're defining it within a project. eg: -# -# include php::fpm::5_4_10 -# define php::fpm( $ensure = present, $version = $name, ){ require php::config + # Current supported and secure versions + $secure_5_6 = $php::config::secure_versions['5.6'] + $secure_5_5 = $php::config::secure_versions['5.5'] + $secure_5_4 = $php::config::secure_versions['5.4'] + + # Specify secure version if no minor point specified + if $version == '5' { + $patch_version = $secure_5_6 + } elsif $version == '5.6' { + $patch_version = $secure_5_6 + } elsif $version == '5.5' { + $patch_version = $secure_5_5 + } elsif $version == '5.4' { + $patch_version = $secure_5_4 + } else { + $patch_version = $version + } + # Config file locations - $version_config_root = "${php::config::configdir}/${version}" + $version_config_root = "${php::config::configdir}/${patch_version}" $fpm_config = "${version_config_root}/php-fpm.conf" $fpm_pool_config_dir = "${version_config_root}/pool.d" - $pid_file = "${php::config::datadir}/${version}.pid" + $pid_file = "${php::config::datadir}/${patch_version}.pid" # Log files - $error_log = "${php::config::logdir}/${version}.fpm.error.log" + $error_log = "${php::config::logdir}/${patch_version}.fpm.error.log" if $ensure == present { - # Require php version eg. php::5_4_10 + # Require php version eg. php::version { '5_4_10': } # This will compile, install and set up config dirs if not present - require join(['php', join(split($version, '[.]'), '_')], '::') + php_require($patch_version) # FPM Binary - $bin = "${php::config::root}/versions/${version}/sbin/php-fpm" + $bin = "${php::config::root}/versions/${patch_version}/sbin/php-fpm" # Set up FPM config file { $fpm_config: content => template('php/php-fpm.conf.erb'), - notify => Php::Fpm::Service[$version], + notify => Php::Fpm::Service[$patch_version], } # Set up FPM Pool config directory @@ -50,8 +62,8 @@ # Create a default pool, as FPM won't start without one # Listen on a fake socket for now - $pool_name = $version - $socket_path = "${boxen::config::socketdir}/${version}" + $pool_name = $patch_version + $socket_path = "${boxen::config::socketdir}/${patch_version}" $pm = 'static' $max_children = 1 @@ -60,15 +72,15 @@ $min_spare_servers = 1 $max_spare_servers = 1 - file { "${fpm_pool_config_dir}/${version}.conf": + file { "${fpm_pool_config_dir}/${patch_version}.conf": content => template('php/php-fpm-pool.conf.erb'), } # Launch our FPM Service - php::fpm::service{ $version: + php::fpm::service{ $patch_version: ensure => running, - subscribe => File["${fpm_pool_config_dir}/${version}.conf"], + subscribe => File["${fpm_pool_config_dir}/${patch_version}.conf"], } } else { @@ -81,10 +93,10 @@ $fpm_pool_config_dir, ]: ensure => absent, - require => Php::Fpm::Service[$version], + require => Php::Fpm::Service[$patch_version], } - php::fpm::service{ $version: + php::fpm::service{ $patch_version: ensure => absent, } } diff --git a/manifests/fpm/5_3_10.pp b/manifests/fpm/5_3_10.pp deleted file mode 100644 index 230d8f9..0000000 --- a/manifests/fpm/5_3_10.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.10 -# Installs PHP 5.3.10 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_10 -# -class php::fpm::5_3_10 { - php::fpm { '5.3.10': } -} diff --git a/manifests/fpm/5_3_11.pp b/manifests/fpm/5_3_11.pp deleted file mode 100644 index 3fb6ff8..0000000 --- a/manifests/fpm/5_3_11.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.11 -# Installs PHP 5.3.11 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_11 -# -class php::fpm::5_3_11 { - php::fpm { '5.3.11': } -} diff --git a/manifests/fpm/5_3_12.pp b/manifests/fpm/5_3_12.pp deleted file mode 100644 index 344dbf8..0000000 --- a/manifests/fpm/5_3_12.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.12 -# Installs PHP 5.3.12 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_12 -# -class php::fpm::5_3_12 { - php::fpm { '5.3.12': } -} diff --git a/manifests/fpm/5_3_13.pp b/manifests/fpm/5_3_13.pp deleted file mode 100644 index 833c3f7..0000000 --- a/manifests/fpm/5_3_13.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.13 -# Installs PHP 5.3.13 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_13 -# -class php::fpm::5_3_13 { - php::fpm { '5.3.13': } -} diff --git a/manifests/fpm/5_3_14.pp b/manifests/fpm/5_3_14.pp deleted file mode 100644 index 0f505448..0000000 --- a/manifests/fpm/5_3_14.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.14 -# Installs PHP 5.3.14 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_14 -# -class php::fpm::5_3_14 { - php::fpm { '5.3.14': } -} diff --git a/manifests/fpm/5_3_15.pp b/manifests/fpm/5_3_15.pp deleted file mode 100644 index 874c2a9..0000000 --- a/manifests/fpm/5_3_15.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.15 -# Installs PHP 5.3.15 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_15 -# -class php::fpm::5_3_15 { - php::fpm { '5.3.15': } -} diff --git a/manifests/fpm/5_3_16.pp b/manifests/fpm/5_3_16.pp deleted file mode 100644 index 007553f..0000000 --- a/manifests/fpm/5_3_16.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.16 -# Installs PHP 5.3.16 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_16 -# -class php::fpm::5_3_16 { - php::fpm { '5.3.16': } -} diff --git a/manifests/fpm/5_3_17.pp b/manifests/fpm/5_3_17.pp deleted file mode 100644 index f4ba832..0000000 --- a/manifests/fpm/5_3_17.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.17 -# Installs PHP 5.3.17 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_17 -# -class php::fpm::5_3_17 { - php::fpm { '5.3.17': } -} diff --git a/manifests/fpm/5_3_18.pp b/manifests/fpm/5_3_18.pp deleted file mode 100644 index 6fca9ee..0000000 --- a/manifests/fpm/5_3_18.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.18 -# Installs PHP 5.3.18 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_18 -# -class php::fpm::5_3_18 { - php::fpm { '5.3.18': } -} diff --git a/manifests/fpm/5_3_19.pp b/manifests/fpm/5_3_19.pp deleted file mode 100644 index 54ceaef..0000000 --- a/manifests/fpm/5_3_19.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.19 -# Installs PHP 5.3.19 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_19 -# -class php::fpm::5_3_19 { - php::fpm { '5.3.19': } -} diff --git a/manifests/fpm/5_3_2.pp b/manifests/fpm/5_3_2.pp deleted file mode 100644 index c7e726d..0000000 --- a/manifests/fpm/5_3_2.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.2 -# Installs PHP 5.3.2 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_2 -# -class php::fpm::5_3_2 { - php::fpm { '5.3.2': } -} diff --git a/manifests/fpm/5_3_20.pp b/manifests/fpm/5_3_20.pp deleted file mode 100644 index 6cb69e7..0000000 --- a/manifests/fpm/5_3_20.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.20 -# Installs PHP 5.3.20 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_20 -# -class php::fpm::5_3_20 { - php::fpm { '5.3.20': } -} diff --git a/manifests/fpm/5_3_21.pp b/manifests/fpm/5_3_21.pp deleted file mode 100644 index 9de6193..0000000 --- a/manifests/fpm/5_3_21.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.21 -# Installs PHP 5.3.21 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_21 -# -class php::fpm::5_3_21 { - php::fpm { '5.3.21': } -} diff --git a/manifests/fpm/5_3_22.pp b/manifests/fpm/5_3_22.pp deleted file mode 100644 index 645afba..0000000 --- a/manifests/fpm/5_3_22.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.22 -# Installs PHP 5.3.22 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_22 -# -class php::fpm::5_3_22 { - php::fpm { '5.3.22': } -} diff --git a/manifests/fpm/5_3_23.pp b/manifests/fpm/5_3_23.pp deleted file mode 100644 index 1e76c93..0000000 --- a/manifests/fpm/5_3_23.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.23 -# Installs PHP 5.3.23 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_23 -# -class php::fpm::5_3_23 { - php::fpm { '5.3.23': } -} diff --git a/manifests/fpm/5_3_24.pp b/manifests/fpm/5_3_24.pp deleted file mode 100644 index 320b4a4..0000000 --- a/manifests/fpm/5_3_24.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.24 -# Installs PHP 5.3.24 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_24 -# -class php::fpm::5_3_24 { - php::fpm { '5.3.24': } -} diff --git a/manifests/fpm/5_3_25.pp b/manifests/fpm/5_3_25.pp deleted file mode 100644 index f9fe67e..0000000 --- a/manifests/fpm/5_3_25.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.25 -# Installs PHP 5.3.25 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_25 -# -class php::fpm::5_3_25 { - php::fpm { '5.3.25': } -} diff --git a/manifests/fpm/5_3_26.pp b/manifests/fpm/5_3_26.pp deleted file mode 100644 index 725d26c..0000000 --- a/manifests/fpm/5_3_26.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.26 -# Installs PHP 5.3.26 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_26 -# -class php::fpm::5_3_26 { - php::fpm { '5.3.26': } -} diff --git a/manifests/fpm/5_3_27.pp b/manifests/fpm/5_3_27.pp deleted file mode 100644 index b953292..0000000 --- a/manifests/fpm/5_3_27.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.27 -# Installs PHP 5.3.27 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_27 -# -class php::fpm::5_3_27 { - php::fpm { '5.3.27': } -} diff --git a/manifests/fpm/5_3_28.pp b/manifests/fpm/5_3_28.pp deleted file mode 100644 index 815cff6..0000000 --- a/manifests/fpm/5_3_28.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.28 -# Installs PHP 5.3.28 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_28 -# -class php::fpm::5_3_28 { - php::fpm { '5.3.28': } -} diff --git a/manifests/fpm/5_3_3.pp b/manifests/fpm/5_3_3.pp deleted file mode 100644 index 6624441..0000000 --- a/manifests/fpm/5_3_3.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.3 -# Installs PHP 5.3.3 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_3 -# -class php::fpm::5_3_3 { - php::fpm { '5.3.3': } -} diff --git a/manifests/fpm/5_3_4.pp b/manifests/fpm/5_3_4.pp deleted file mode 100644 index ce258d1..0000000 --- a/manifests/fpm/5_3_4.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.4 -# Installs PHP 5.3.4 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_4 -# -class php::fpm::5_3_4 { - php::fpm { '5.3.4': } -} diff --git a/manifests/fpm/5_3_5.pp b/manifests/fpm/5_3_5.pp deleted file mode 100644 index 22480f3..0000000 --- a/manifests/fpm/5_3_5.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.5 -# Installs PHP 5.3.5 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_5 -# -class php::fpm::5_3_5 { - php::fpm { '5.3.5': } -} diff --git a/manifests/fpm/5_3_6.pp b/manifests/fpm/5_3_6.pp deleted file mode 100644 index a895373..0000000 --- a/manifests/fpm/5_3_6.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.6 -# Installs PHP 5.3.6 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_6 -# -class php::fpm::5_3_6 { - php::fpm { '5.3.6': } -} diff --git a/manifests/fpm/5_3_7.pp b/manifests/fpm/5_3_7.pp deleted file mode 100644 index 8232bab..0000000 --- a/manifests/fpm/5_3_7.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.7 -# Installs PHP 5.3.7 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_7 -# -class php::fpm::5_3_7 { - php::fpm { '5.3.7': } -} diff --git a/manifests/fpm/5_3_8.pp b/manifests/fpm/5_3_8.pp deleted file mode 100644 index b83da3e..0000000 --- a/manifests/fpm/5_3_8.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.8 -# Installs PHP 5.3.8 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_8 -# -class php::fpm::5_3_8 { - php::fpm { '5.3.8': } -} diff --git a/manifests/fpm/5_3_9.pp b/manifests/fpm/5_3_9.pp deleted file mode 100644 index 8b91160..0000000 --- a/manifests/fpm/5_3_9.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.3.9 -# Installs PHP 5.3.9 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_3_9 -# -class php::fpm::5_3_9 { - php::fpm { '5.3.9': } -} diff --git a/manifests/fpm/5_4_1.pp b/manifests/fpm/5_4_1.pp deleted file mode 100644 index 6cdfb49..0000000 --- a/manifests/fpm/5_4_1.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.1 -# Installs PHP 5.4.1 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_1 -# -class php::fpm::5_4_1 { - php::fpm { '5.4.1': } -} diff --git a/manifests/fpm/5_4_10.pp b/manifests/fpm/5_4_10.pp deleted file mode 100644 index dcf2c2c..0000000 --- a/manifests/fpm/5_4_10.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.10 -# Installs PHP 5.4.10 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_10 -# -class php::fpm::5_4_10 { - php::fpm { '5.4.10': } -} diff --git a/manifests/fpm/5_4_11.pp b/manifests/fpm/5_4_11.pp deleted file mode 100644 index f0a88a4..0000000 --- a/manifests/fpm/5_4_11.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.11 -# Installs PHP 5.4.11 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_11 -# -class php::fpm::5_4_11 { - php::fpm { '5.4.11': } -} diff --git a/manifests/fpm/5_4_12.pp b/manifests/fpm/5_4_12.pp deleted file mode 100644 index 63729e6..0000000 --- a/manifests/fpm/5_4_12.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.12 -# Installs PHP 5.4.12 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_12 -# -class php::fpm::5_4_12 { - php::fpm { '5.4.12': } -} diff --git a/manifests/fpm/5_4_13.pp b/manifests/fpm/5_4_13.pp deleted file mode 100644 index 1b1d145..0000000 --- a/manifests/fpm/5_4_13.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.13 -# Installs PHP 5.4.13 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_13 -# -class php::fpm::5_4_13 { - php::fpm { '5.4.13': } -} diff --git a/manifests/fpm/5_4_14.pp b/manifests/fpm/5_4_14.pp deleted file mode 100644 index 8bce8a0..0000000 --- a/manifests/fpm/5_4_14.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.14 -# Installs PHP 5.4.14 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_14 -# -class php::fpm::5_4_14 { - php::fpm { '5.4.14': } -} diff --git a/manifests/fpm/5_4_15.pp b/manifests/fpm/5_4_15.pp deleted file mode 100644 index 2f4c5dc..0000000 --- a/manifests/fpm/5_4_15.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.15 -# Installs PHP 5.4.15 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_15 -# -class php::fpm::5_4_15 { - php::fpm { '5.4.15': } -} diff --git a/manifests/fpm/5_4_16.pp b/manifests/fpm/5_4_16.pp deleted file mode 100644 index 9f59858..0000000 --- a/manifests/fpm/5_4_16.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.16 -# Installs PHP 5.4.16 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_16 -# -class php::fpm::5_4_16 { - php::fpm { '5.4.16': } -} diff --git a/manifests/fpm/5_4_17.pp b/manifests/fpm/5_4_17.pp deleted file mode 100644 index 9d8c11f..0000000 --- a/manifests/fpm/5_4_17.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.17 -# Installs PHP 5.4.17 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_17 -# -class php::fpm::5_4_17 { - php::fpm { '5.4.17': } -} diff --git a/manifests/fpm/5_4_18.pp b/manifests/fpm/5_4_18.pp deleted file mode 100644 index 5e92adb..0000000 --- a/manifests/fpm/5_4_18.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.18 -# Installs PHP 5.4.18 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_18 -# -class php::fpm::5_4_18 { - php::fpm { '5.4.18': } -} diff --git a/manifests/fpm/5_4_19.pp b/manifests/fpm/5_4_19.pp deleted file mode 100644 index 42c3e91..0000000 --- a/manifests/fpm/5_4_19.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.19 -# Installs PHP 5.4.19 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_19 -# -class php::fpm::5_4_19 { - php::fpm { '5.4.19': } -} diff --git a/manifests/fpm/5_4_2.pp b/manifests/fpm/5_4_2.pp deleted file mode 100644 index 3330af5..0000000 --- a/manifests/fpm/5_4_2.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.2 -# Installs PHP 5.4.2 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_2 -# -class php::fpm::5_4_2 { - php::fpm { '5.4.2': } -} diff --git a/manifests/fpm/5_4_20.pp b/manifests/fpm/5_4_20.pp deleted file mode 100644 index 0951919..0000000 --- a/manifests/fpm/5_4_20.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.20 -# Installs PHP 5.4.20 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_20 -# -class php::fpm::5_4_20 { - php::fpm { '5.4.20': } -} diff --git a/manifests/fpm/5_4_21.pp b/manifests/fpm/5_4_21.pp deleted file mode 100644 index 904b42a..0000000 --- a/manifests/fpm/5_4_21.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.21 -# Installs PHP 5.4.21 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_21 -# -class php::fpm::5_4_21 { - php::fpm { '5.4.21': } -} diff --git a/manifests/fpm/5_4_22.pp b/manifests/fpm/5_4_22.pp deleted file mode 100644 index 8e4ef0f..0000000 --- a/manifests/fpm/5_4_22.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.22 -# Installs PHP 5.4.22 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_22 -# -class php::fpm::5_4_22 { - php::fpm { '5.4.22': } -} diff --git a/manifests/fpm/5_4_23.pp b/manifests/fpm/5_4_23.pp deleted file mode 100644 index 914f195..0000000 --- a/manifests/fpm/5_4_23.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.23 -# Installs PHP 5.4.23 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_23 -# -class php::fpm::5_4_23 { - php::fpm { '5.4.23': } -} diff --git a/manifests/fpm/5_4_24.pp b/manifests/fpm/5_4_24.pp deleted file mode 100644 index cd9ac22..0000000 --- a/manifests/fpm/5_4_24.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.24 -# Installs PHP 5.4.24 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_24 -# -class php::fpm::5_4_24 { - php::fpm { '5.4.24': } -} diff --git a/manifests/fpm/5_4_25.pp b/manifests/fpm/5_4_25.pp deleted file mode 100644 index d449053..0000000 --- a/manifests/fpm/5_4_25.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.25 -# Installs PHP 5.4.25 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_25 -# -class php::fpm::5_4_25 { - php::fpm { '5.4.25': } -} diff --git a/manifests/fpm/5_4_26.pp b/manifests/fpm/5_4_26.pp deleted file mode 100644 index 66ae916..0000000 --- a/manifests/fpm/5_4_26.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.26 -# Installs PHP 5.4.26 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_26 -# -class php::fpm::5_4_26 { - php::fpm { '5.4.26': } -} diff --git a/manifests/fpm/5_4_27.pp b/manifests/fpm/5_4_27.pp deleted file mode 100644 index 10c54a1..0000000 --- a/manifests/fpm/5_4_27.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.27 -# Installs PHP 5.4.27 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_27 -# -class php::fpm::5_4_27 { - php::fpm { '5.4.27': } -} diff --git a/manifests/fpm/5_4_28.pp b/manifests/fpm/5_4_28.pp deleted file mode 100644 index 63a0071..0000000 --- a/manifests/fpm/5_4_28.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.28 -# Installs PHP 5.4.28 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_28 -# -class php::fpm::5_4_28 { - php::fpm { '5.4.28': } -} diff --git a/manifests/fpm/5_4_29.pp b/manifests/fpm/5_4_29.pp deleted file mode 100644 index c5768b8..0000000 --- a/manifests/fpm/5_4_29.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.29 -# Installs PHP 5.4.29 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_29 -# -class php::fpm::5_4_29 { - php::fpm { '5.4.29': } -} diff --git a/manifests/fpm/5_4_3.pp b/manifests/fpm/5_4_3.pp deleted file mode 100644 index 2f50f51..0000000 --- a/manifests/fpm/5_4_3.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.3 -# Installs PHP 5.4.3 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_3 -# -class php::fpm::5_4_3 { - php::fpm { '5.4.3': } -} diff --git a/manifests/fpm/5_4_4.pp b/manifests/fpm/5_4_4.pp deleted file mode 100644 index ab03b1d..0000000 --- a/manifests/fpm/5_4_4.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.4 -# Installs PHP 5.4.4 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_4 -# -class php::fpm::5_4_4 { - php::fpm { '5.4.4': } -} diff --git a/manifests/fpm/5_4_5.pp b/manifests/fpm/5_4_5.pp deleted file mode 100644 index 54c1706..0000000 --- a/manifests/fpm/5_4_5.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.5 -# Installs PHP 5.4.5 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_5 -# -class php::fpm::5_4_5 { - php::fpm { '5.4.5': } -} diff --git a/manifests/fpm/5_4_6.pp b/manifests/fpm/5_4_6.pp deleted file mode 100644 index 063b0a0..0000000 --- a/manifests/fpm/5_4_6.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.6 -# Installs PHP 5.4.6 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_6 -# -class php::fpm::5_4_6 { - php::fpm { '5.4.6': } -} diff --git a/manifests/fpm/5_4_7.pp b/manifests/fpm/5_4_7.pp deleted file mode 100644 index c6bf24f..0000000 --- a/manifests/fpm/5_4_7.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.7 -# Installs PHP 5.4.7 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_7 -# -class php::fpm::5_4_7 { - php::fpm { '5.4.7': } -} diff --git a/manifests/fpm/5_4_8.pp b/manifests/fpm/5_4_8.pp deleted file mode 100644 index aa5bc8c..0000000 --- a/manifests/fpm/5_4_8.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.8 -# Installs PHP 5.4.8 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_8 -# -class php::fpm::5_4_8 { - php::fpm { '5.4.8': } -} diff --git a/manifests/fpm/5_4_9.pp b/manifests/fpm/5_4_9.pp deleted file mode 100644 index 2ed460c..0000000 --- a/manifests/fpm/5_4_9.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.4.9 -# Installs PHP 5.4.9 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_4_9 -# -class php::fpm::5_4_9 { - php::fpm { '5.4.9': } -} diff --git a/manifests/fpm/5_5_0.pp b/manifests/fpm/5_5_0.pp deleted file mode 100644 index 77d4ad9..0000000 --- a/manifests/fpm/5_5_0.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.0 -# Installs PHP 5.5.0 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_0 -# -class php::fpm::5_5_0 { - php::fpm { '5.5.0': } -} diff --git a/manifests/fpm/5_5_1.pp b/manifests/fpm/5_5_1.pp deleted file mode 100644 index 0a59519..0000000 --- a/manifests/fpm/5_5_1.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.1 -# Installs PHP 5.5.1 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_1 -# -class php::fpm::5_5_1 { - php::fpm { '5.5.1': } -} diff --git a/manifests/fpm/5_5_10.pp b/manifests/fpm/5_5_10.pp deleted file mode 100644 index fad7525..0000000 --- a/manifests/fpm/5_5_10.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.10 -# Installs PHP 5.5.10 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_10 -# -class php::fpm::5_5_10 { - php::fpm { '5.5.10': } -} diff --git a/manifests/fpm/5_5_11.pp b/manifests/fpm/5_5_11.pp deleted file mode 100644 index 02ece3b..0000000 --- a/manifests/fpm/5_5_11.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.11 -# Installs PHP 5.5.11 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_11 -# -class php::fpm::5_5_11 { - php::fpm { '5.5.11': } -} diff --git a/manifests/fpm/5_5_12.pp b/manifests/fpm/5_5_12.pp deleted file mode 100644 index cf87a78..0000000 --- a/manifests/fpm/5_5_12.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.12 -# Installs PHP 5.5.12 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_12 -# -class php::fpm::5_5_12 { - php::fpm { '5.5.12': } -} diff --git a/manifests/fpm/5_5_13.pp b/manifests/fpm/5_5_13.pp deleted file mode 100644 index 02a2b73..0000000 --- a/manifests/fpm/5_5_13.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.13 -# Installs PHP 5.5.13 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_13 -# -class php::fpm::5_5_13 { - php::fpm { '5.5.13': } -} diff --git a/manifests/fpm/5_5_14.pp b/manifests/fpm/5_5_14.pp deleted file mode 100644 index b7835e6..0000000 --- a/manifests/fpm/5_5_14.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.14 -# Installs PHP 5.5.14 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_14 -# -class php::fpm::5_5_14 { - php::fpm { '5.5.14': } -} diff --git a/manifests/fpm/5_5_15.pp b/manifests/fpm/5_5_15.pp deleted file mode 100644 index 987f598..0000000 --- a/manifests/fpm/5_5_15.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.15 -# Installs PHP 5.5.15 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_15 -# -class php::fpm::5_5_15 { - php::fpm { '5.5.15': } -} diff --git a/manifests/fpm/5_5_16.pp b/manifests/fpm/5_5_16.pp deleted file mode 100644 index 8065d84..0000000 --- a/manifests/fpm/5_5_16.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.16 -# Installs PHP 5.5.16 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_16 -# -class php::fpm::5_5_16 { - php::fpm { '5.5.16': } -} diff --git a/manifests/fpm/5_5_2.pp b/manifests/fpm/5_5_2.pp deleted file mode 100644 index b10e0b2..0000000 --- a/manifests/fpm/5_5_2.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.2 -# Installs PHP 5.5.2 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_2 -# -class php::fpm::5_5_2 { - php::fpm { '5.5.2': } -} diff --git a/manifests/fpm/5_5_3.pp b/manifests/fpm/5_5_3.pp deleted file mode 100644 index 2bac8ce..0000000 --- a/manifests/fpm/5_5_3.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.3 -# Installs PHP 5.5.3 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_3 -# -class php::fpm::5_5_3 { - php::fpm { '5.5.3': } -} diff --git a/manifests/fpm/5_5_4.pp b/manifests/fpm/5_5_4.pp deleted file mode 100644 index c17f52a..0000000 --- a/manifests/fpm/5_5_4.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.4 -# Installs PHP 5.5.4 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_4 -# -class php::fpm::5_5_4 { - php::fpm { '5.5.4': } -} diff --git a/manifests/fpm/5_5_5.pp b/manifests/fpm/5_5_5.pp deleted file mode 100644 index e118b77..0000000 --- a/manifests/fpm/5_5_5.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.5 -# Installs PHP 5.5.5 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_5 -# -class php::fpm::5_5_5 { - php::fpm { '5.5.5': } -} diff --git a/manifests/fpm/5_5_6.pp b/manifests/fpm/5_5_6.pp deleted file mode 100644 index c58859b..0000000 --- a/manifests/fpm/5_5_6.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.6 -# Installs PHP 5.5.6 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_6 -# -class php::fpm::5_5_6 { - php::fpm { '5.5.6': } -} diff --git a/manifests/fpm/5_5_7.pp b/manifests/fpm/5_5_7.pp deleted file mode 100644 index bfbd7d0..0000000 --- a/manifests/fpm/5_5_7.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.7 -# Installs PHP 5.5.7 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_7 -# -class php::fpm::5_5_7 { - php::fpm { '5.5.7': } -} diff --git a/manifests/fpm/5_5_8.pp b/manifests/fpm/5_5_8.pp deleted file mode 100644 index 6581553..0000000 --- a/manifests/fpm/5_5_8.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.8 -# Installs PHP 5.5.8 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_8 -# -class php::fpm::5_5_8 { - php::fpm { '5.5.8': } -} diff --git a/manifests/fpm/5_5_9.pp b/manifests/fpm/5_5_9.pp deleted file mode 100644 index 3955c84..0000000 --- a/manifests/fpm/5_5_9.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Launches a PHP FPM service running PHP 5.5.9 -# Installs PHP 5.5.9 if it doesn't already exist -# -# Usage: -# -# include php::fpm::5_5_9 -# -class php::fpm::5_5_9 { - php::fpm { '5.5.9': } -} diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index c9fee56..3edb239 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -33,7 +33,7 @@ if $ensure == present { # Ensure that the php fpm service for this php version is installed # eg. php::fpm::5_4_10 - include join(['php', 'fpm', join(split($version, '[.]'), '_')], '::') + php_fpm_require $version # Create a pool config file file { "${fpm_pool_config_dir}/${pool_name}.conf": diff --git a/manifests/global.pp b/manifests/global.pp index 515b7e6..32b9b31 100644 --- a/manifests/global.pp +++ b/manifests/global.pp @@ -7,14 +7,14 @@ class php::global($version = undef) { include php::config - # Default to HEAD 5.4 version if not specified + # Default to latest version of PHP 5 if not specified $php_version = $version ? { - undef => 5.4, + undef => 5, default => $version } if $version != 'system' { - require join(['php', join(split($version, '[.]'), '_')], '::') + php_require($version) } file { "${php::config::root}/version": diff --git a/manifests/init.pp b/manifests/init.pp index 828d74e..e9eebf6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,8 +6,10 @@ # # include php # + class php { require php::config + require homebrew include wget include stdlib @@ -20,8 +22,6 @@ # Get rid of any pre-installed packages package { ['phpenv', 'php-build']: ensure => absent; } - $phpenv_version = '6499bb6c7b645af3f4e67f7e17708d5ee208453f' # Pin to latest version of dev branch as of 2013-10-11 - file { [ $php::config::root, @@ -78,6 +78,7 @@ # Need autoconf version less than 2.59 for php 5.3 (ewwwww) homebrew::formula { 'autoconf213': + source => 'puppet:///modules/php/brews/autoconf213.rb', before => Package['boxen/brews/autoconf213'], } @@ -118,10 +119,11 @@ # Set up phpenv - $git_init = 'git init .' - $git_remote = 'git remote add origin https://github.com/phpenv/phpenv.git' - $git_fetch = 'git fetch -q origin' - $git_reset = "git reset --hard ${phpenv_version}" + $git_init = 'git init .' + $git_remote = 'git remote add origin https://github.com/phpenv/phpenv.git' + $git_fetch = 'git fetch -q origin' + $git_revision = $php::config::phpenv['revision'] + $git_reset = "git reset --hard ${git_revision}" exec { 'phpenv-setup-root-repo': command => "${git_init} && ${git_remote} && ${git_fetch} && ${git_reset}", @@ -133,9 +135,9 @@ ] } - exec { "ensure-phpenv-version-${phpenv_version}": - command => "${git_fetch} && git reset --hard ${phpenv_version}", - unless => "git rev-parse HEAD | grep ${phpenv_version}", + exec { "ensure-phpenv-version-${git_revision}": + command => "${git_fetch} && git reset --hard ${git_revision}", + unless => "git rev-parse HEAD | grep ${git_revision}", cwd => $php::config::root, require => Exec['phpenv-setup-root-repo'] } diff --git a/manifests/local.pp b/manifests/local.pp index 942b075..12ec33c 100644 --- a/manifests/local.pp +++ b/manifests/local.pp @@ -10,7 +10,7 @@ if $version != 'system' and $ensure == present { # Requires php version eg. php::5_4_10 - require join(['php', join(split($version, '[.]'), '_')], '::') + php_require($version) } file { "${name}/.php-version": diff --git a/manifests/project.pp b/manifests/project.pp index 1ebcd94..70d90a0 100644 --- a/manifests/project.pp +++ b/manifests/project.pp @@ -203,9 +203,10 @@ # Spin up a PHP-FPM pool for this project, listening on an Nginx socket php::fpm::pool { "${name}-${php}": - version => $php, - socket_path => "${boxen::config::socketdir}/${name}", - require => File["${nginx::config::sitesdir}/${name}.conf"], + version => $php, + socket_path => "${boxen::config::socketdir}/${name}", + require => File["${nginx::config::sitesdir}/${name}.conf"], + max_children => 10, } if $fpm_pool { diff --git a/manifests/version.pp b/manifests/version.pp index 68af67f..1eff4dc 100644 --- a/manifests/version.pp +++ b/manifests/version.pp @@ -4,28 +4,54 @@ # # php::version { '5.3.20': } # -# There are a number of predefined classes which can be used rather than -# using this class directly, which allows the class to be defined multiple -# times - eg. if you define it within multiple projects. For example: -# -# include php::5_3_20 -# define php::version( - $ensure = 'installed', - $version = $name + $ensure = 'installed', + $version = $name ) { require php - include boxen::config include mysql::config + # Current supported and secure versions + $secure_5_6 = $php::config::secure_versions['5.6'] + $secure_5_5 = $php::config::secure_versions['5.5'] + $secure_5_4 = $php::config::secure_versions['5.4'] + + # Specify secure version if no minor point specified + if $version == '5' { + $patch_version = $secure_5_6 + } elsif $version == '5.6' { + $patch_version = $secure_5_6 + } elsif $version == '5.5' { + $patch_version = $secure_5_5 + } elsif $version == '5.4' { + $patch_version = $secure_5_4 + } else { + $patch_version = $version + } + + # Version is greater than or equal to 5.6.0 and less than the 5.6 secure version + if $php::config::secure_warning and versioncmp($patch_version, '5.6') >= 0 and versioncmp($patch_version, $secure_5_6) < 0 { + warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.6.X version is ${secure_5_6}") + } + + # Version is greater than or equal to 5.5.0 and less than the 5.5 secure version + if $php::config::secure_warning and versioncmp($patch_version, '5.5') >= 0 and versioncmp($patch_version, $secure_5_5) < 0 { + warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.5.X version is ${secure_5_5}") + } + + # Version is less than the minimum secure version + if $php::config::secure_warning and versioncmp($patch_version, $secure_5_4) < 0 { + warning("You are installing PHP ${patch_version} which is known to be insecure. The current secure 5.4.X version is ${secure_5_4}") + } + # Install location - $dest = "${php::config::root}/versions/${version}" + $dest = "${php::config::root}/versions/${patch_version}" # Log locations - $error_log = "${php::config::logdir}/${version}.error.log" + $error_log = "${php::config::logdir}/${patch_version}.error.log" # Config locations - $version_config_root = "${php::config::configdir}/${version}" + $version_config_root = "${php::config::configdir}/${patch_version}" $php_ini = "${version_config_root}/php.ini" $conf_d = "${version_config_root}/conf.d" @@ -33,14 +59,14 @@ $module_dir = "${dest}/modules" # Data directory for this version - $version_data_root = "${php::config::datadir}/${version}" + $version_data_root = "${php::config::datadir}/${patch_version}" if $ensure == 'absent' { # If we're nuking a version of PHP also ensure we shut down # and get rid of the PHP FPM Service & config - php::fpm { $version: + php::fpm { $patch_version: ensure => 'absent' } @@ -57,13 +83,11 @@ } else { # Data directory - file { $version_data_root: ensure => directory, } # Set up config directories - file { $version_config_root: ensure => directory, } @@ -78,18 +102,16 @@ # Ensure module dir is created for extensions AFTER php is installed file { $module_dir: ensure => directory, - require => Php_version[$version], + require => Php_version[$patch_version], } # Set up config files - file { $php_ini: content => template('php/php.ini.erb'), require => File[$version_config_root] } # Log files - file { $error_log: owner => $::boxen_user, mode => '0644', @@ -97,13 +119,19 @@ # Install PHP! - php_version { $version: - user => $::boxen_user, - user_home => "/Users/${::boxen_user}", - phpenv_root => $php::config::root, - version => $version, - homebrew_path => $boxen::config::homebrewdir, - require => [ + # Get any additional configure params + $test_params = $php::config::configure_params + if is_hash($test_params) and has_key($test_params, $patch_version) { + $configure_params = $test_params[$patch_version] + } + + php_version { $patch_version: + user => $::boxen_user, + user_home => "/Users/${::boxen_user}", + phpenv_root => $php::config::root, + version => $patch_version, + homebrew_path => $boxen::config::homebrewdir, + require => [ Repository["${php::config::root}/php-src"], Package['gettext'], Package['boxen/brews/freetypephp'], @@ -116,7 +144,8 @@ Package['autoconf'], Package['boxen/brews/autoconf213'], ], - notify => Exec["phpenv-rehash-post-install-${version}"], + notify => Exec["phpenv-rehash-post-install-${patch_version}"], + configure_params => $configure_params, } # Fix permissions for php versions installed prior to 0.3.5 of this module @@ -125,13 +154,13 @@ owner => $::boxen_user, group => 'staff', recurse => true, - require => Php_version[$version], + require => Php_version[$patch_version], } # Rehash phpenv shims when a new version is installed - exec { "phpenv-rehash-post-install-${version}": + exec { "phpenv-rehash-post-install-${patch_version}": command => "/bin/rm -rf ${php::config::root}/shims && PHPENV_ROOT=${php::config::root} ${php::config::root}/bin/phpenv rehash", - require => Php_version[$version], + require => Php_version[$patch_version], refreshonly => true, } @@ -144,31 +173,31 @@ } # Set cache_dir for PEAR - exec { "pear-${version}-cache_dir": + exec { "pear-${patch_version}-cache_dir": command => "${dest}/bin/pear config-set cache_dir ${php::config::datadir}/pear", unless => "${dest}/bin/pear config-get cache_dir | grep -i ${php::config::datadir}/pear", require => [ - Php_version[$version], + Php_version[$patch_version], File["${php::config::datadir}/pear"], ], } # Set download_dir for PEAR - exec { "pear-${version}-download_dir": + exec { "pear-${patch_version}-download_dir": command => "${dest}/bin/pear config-set download_dir ${php::config::datadir}/pear", unless => "${dest}/bin/pear config-get download_dir | grep -i ${php::config::datadir}/pear", require => [ - Php_version[$version], + Php_version[$patch_version], File["${php::config::datadir}/pear"], ], } # Set temp_dir for PEAR - exec { "pear-${version}-temp_dir": + exec { "pear-${patch_version}-temp_dir": command => "${dest}/bin/pear config-set temp_dir ${php::config::datadir}/pear", unless => "${dest}/bin/pear config-get temp_dir | grep -i ${php::config::datadir}/pear", require => [ - Php_version[$version], + Php_version[$patch_version], File["${php::config::datadir}/pear"], ], } diff --git a/spec/classes/fpm/php_fpm_5_3_10_spec.rb b/spec/classes/fpm/php_fpm_5_3_10_spec.rb deleted file mode 100644 index 8f1ea07..0000000 --- a/spec/classes/fpm/php_fpm_5_3_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.10") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_11_spec.rb b/spec/classes/fpm/php_fpm_5_3_11_spec.rb deleted file mode 100644 index e3d0a13..0000000 --- a/spec/classes/fpm/php_fpm_5_3_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.11") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_12_spec.rb b/spec/classes/fpm/php_fpm_5_3_12_spec.rb deleted file mode 100644 index bb3b198..0000000 --- a/spec/classes/fpm/php_fpm_5_3_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.12") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_13_spec.rb b/spec/classes/fpm/php_fpm_5_3_13_spec.rb deleted file mode 100644 index 4b3a5d6..0000000 --- a/spec/classes/fpm/php_fpm_5_3_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.13") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_14_spec.rb b/spec/classes/fpm/php_fpm_5_3_14_spec.rb deleted file mode 100644 index eb2de76..0000000 --- a/spec/classes/fpm/php_fpm_5_3_14_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_14" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.14") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_15_spec.rb b/spec/classes/fpm/php_fpm_5_3_15_spec.rb deleted file mode 100644 index 11ecafb..0000000 --- a/spec/classes/fpm/php_fpm_5_3_15_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_15" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.15") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_16_spec.rb b/spec/classes/fpm/php_fpm_5_3_16_spec.rb deleted file mode 100644 index 1c3594d..0000000 --- a/spec/classes/fpm/php_fpm_5_3_16_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_16" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.16") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_17_spec.rb b/spec/classes/fpm/php_fpm_5_3_17_spec.rb deleted file mode 100644 index 501d404..0000000 --- a/spec/classes/fpm/php_fpm_5_3_17_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_17" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.17") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_18_spec.rb b/spec/classes/fpm/php_fpm_5_3_18_spec.rb deleted file mode 100644 index c098e94..0000000 --- a/spec/classes/fpm/php_fpm_5_3_18_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_18" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.18") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_19_spec.rb b/spec/classes/fpm/php_fpm_5_3_19_spec.rb deleted file mode 100644 index 14e93a3..0000000 --- a/spec/classes/fpm/php_fpm_5_3_19_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_19" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.19") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_20_spec.rb b/spec/classes/fpm/php_fpm_5_3_20_spec.rb deleted file mode 100644 index 1fc4c1a..0000000 --- a/spec/classes/fpm/php_fpm_5_3_20_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_20" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.20") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_21_spec.rb b/spec/classes/fpm/php_fpm_5_3_21_spec.rb deleted file mode 100644 index ba9b61b..0000000 --- a/spec/classes/fpm/php_fpm_5_3_21_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_21" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.21") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_22_spec.rb b/spec/classes/fpm/php_fpm_5_3_22_spec.rb deleted file mode 100644 index a2ea329..0000000 --- a/spec/classes/fpm/php_fpm_5_3_22_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_22" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.22") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_23_spec.rb b/spec/classes/fpm/php_fpm_5_3_23_spec.rb deleted file mode 100644 index dc8e281..0000000 --- a/spec/classes/fpm/php_fpm_5_3_23_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_23" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.23") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_24_spec.rb b/spec/classes/fpm/php_fpm_5_3_24_spec.rb deleted file mode 100644 index cbf2a92..0000000 --- a/spec/classes/fpm/php_fpm_5_3_24_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_24" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.24") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_25_spec.rb b/spec/classes/fpm/php_fpm_5_3_25_spec.rb deleted file mode 100644 index 824145c..0000000 --- a/spec/classes/fpm/php_fpm_5_3_25_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_25" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.25") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_26_spec.rb b/spec/classes/fpm/php_fpm_5_3_26_spec.rb deleted file mode 100644 index f2580e7..0000000 --- a/spec/classes/fpm/php_fpm_5_3_26_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_26" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.26") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_27_spec.rb b/spec/classes/fpm/php_fpm_5_3_27_spec.rb deleted file mode 100644 index f52ed0e..0000000 --- a/spec/classes/fpm/php_fpm_5_3_27_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_27" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.27") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_28_spec.rb b/spec/classes/fpm/php_fpm_5_3_28_spec.rb deleted file mode 100644 index af3af39..0000000 --- a/spec/classes/fpm/php_fpm_5_3_28_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_28" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.28") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_2_spec.rb b/spec/classes/fpm/php_fpm_5_3_2_spec.rb deleted file mode 100644 index 5df366d..0000000 --- a/spec/classes/fpm/php_fpm_5_3_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.2") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_3_spec.rb b/spec/classes/fpm/php_fpm_5_3_3_spec.rb deleted file mode 100644 index d84599e..0000000 --- a/spec/classes/fpm/php_fpm_5_3_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.3") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_4_spec.rb b/spec/classes/fpm/php_fpm_5_3_4_spec.rb deleted file mode 100644 index 459ed26..0000000 --- a/spec/classes/fpm/php_fpm_5_3_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.4") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_5_spec.rb b/spec/classes/fpm/php_fpm_5_3_5_spec.rb deleted file mode 100644 index d01a560..0000000 --- a/spec/classes/fpm/php_fpm_5_3_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.5") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_6_spec.rb b/spec/classes/fpm/php_fpm_5_3_6_spec.rb deleted file mode 100644 index 9f6642a..0000000 --- a/spec/classes/fpm/php_fpm_5_3_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.6") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_7_spec.rb b/spec/classes/fpm/php_fpm_5_3_7_spec.rb deleted file mode 100644 index f8ff362..0000000 --- a/spec/classes/fpm/php_fpm_5_3_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.7") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_8_spec.rb b/spec/classes/fpm/php_fpm_5_3_8_spec.rb deleted file mode 100644 index 8c77321..0000000 --- a/spec/classes/fpm/php_fpm_5_3_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.8") - end -end diff --git a/spec/classes/fpm/php_fpm_5_3_9_spec.rb b/spec/classes/fpm/php_fpm_5_3_9_spec.rb deleted file mode 100644 index dfa2f3e..0000000 --- a/spec/classes/fpm/php_fpm_5_3_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_3_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.3.9") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_10_spec.rb b/spec/classes/fpm/php_fpm_5_4_10_spec.rb deleted file mode 100644 index eda0a57..0000000 --- a/spec/classes/fpm/php_fpm_5_4_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.10") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_11_spec.rb b/spec/classes/fpm/php_fpm_5_4_11_spec.rb deleted file mode 100644 index c2ed1a0..0000000 --- a/spec/classes/fpm/php_fpm_5_4_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.11") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_12_spec.rb b/spec/classes/fpm/php_fpm_5_4_12_spec.rb deleted file mode 100644 index fc581fa..0000000 --- a/spec/classes/fpm/php_fpm_5_4_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.12") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_13_spec.rb b/spec/classes/fpm/php_fpm_5_4_13_spec.rb deleted file mode 100644 index 3692131..0000000 --- a/spec/classes/fpm/php_fpm_5_4_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.13") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_14_spec.rb b/spec/classes/fpm/php_fpm_5_4_14_spec.rb deleted file mode 100644 index 3f13868..0000000 --- a/spec/classes/fpm/php_fpm_5_4_14_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_14" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.14") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_15_spec.rb b/spec/classes/fpm/php_fpm_5_4_15_spec.rb deleted file mode 100644 index 9d0ceef..0000000 --- a/spec/classes/fpm/php_fpm_5_4_15_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_15" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.15") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_16_spec.rb b/spec/classes/fpm/php_fpm_5_4_16_spec.rb deleted file mode 100644 index 32613d0..0000000 --- a/spec/classes/fpm/php_fpm_5_4_16_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_16" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.16") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_17_spec.rb b/spec/classes/fpm/php_fpm_5_4_17_spec.rb deleted file mode 100644 index 0b10b2b..0000000 --- a/spec/classes/fpm/php_fpm_5_4_17_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_17" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.17") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_18_spec.rb b/spec/classes/fpm/php_fpm_5_4_18_spec.rb deleted file mode 100644 index 59326e4..0000000 --- a/spec/classes/fpm/php_fpm_5_4_18_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_18" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.18") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_19_spec.rb b/spec/classes/fpm/php_fpm_5_4_19_spec.rb deleted file mode 100644 index 06b7ee6..0000000 --- a/spec/classes/fpm/php_fpm_5_4_19_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_19" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.19") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_1_spec.rb b/spec/classes/fpm/php_fpm_5_4_1_spec.rb deleted file mode 100644 index 2bcd04a..0000000 --- a/spec/classes/fpm/php_fpm_5_4_1_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_1" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.1") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_20_spec.rb b/spec/classes/fpm/php_fpm_5_4_20_spec.rb deleted file mode 100644 index 5310d07..0000000 --- a/spec/classes/fpm/php_fpm_5_4_20_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_20" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.20") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_21_spec.rb b/spec/classes/fpm/php_fpm_5_4_21_spec.rb deleted file mode 100644 index 2bbbe29..0000000 --- a/spec/classes/fpm/php_fpm_5_4_21_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_21" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.21") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_22_spec.rb b/spec/classes/fpm/php_fpm_5_4_22_spec.rb deleted file mode 100644 index 37cb8bf..0000000 --- a/spec/classes/fpm/php_fpm_5_4_22_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_22" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.22") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_23_spec.rb b/spec/classes/fpm/php_fpm_5_4_23_spec.rb deleted file mode 100644 index 04a52dc..0000000 --- a/spec/classes/fpm/php_fpm_5_4_23_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_23" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.23") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_24_spec.rb b/spec/classes/fpm/php_fpm_5_4_24_spec.rb deleted file mode 100644 index 3721206..0000000 --- a/spec/classes/fpm/php_fpm_5_4_24_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_24" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.24") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_25_spec.rb b/spec/classes/fpm/php_fpm_5_4_25_spec.rb deleted file mode 100644 index 87f1a58..0000000 --- a/spec/classes/fpm/php_fpm_5_4_25_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_25" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.25") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_26_spec.rb b/spec/classes/fpm/php_fpm_5_4_26_spec.rb deleted file mode 100644 index 735ef02..0000000 --- a/spec/classes/fpm/php_fpm_5_4_26_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_26" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.26") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_2_spec.rb b/spec/classes/fpm/php_fpm_5_4_2_spec.rb deleted file mode 100644 index 4857f5c..0000000 --- a/spec/classes/fpm/php_fpm_5_4_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.2") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_3_spec.rb b/spec/classes/fpm/php_fpm_5_4_3_spec.rb deleted file mode 100644 index f315ef9..0000000 --- a/spec/classes/fpm/php_fpm_5_4_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.3") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_4_spec.rb b/spec/classes/fpm/php_fpm_5_4_4_spec.rb deleted file mode 100644 index 5869112..0000000 --- a/spec/classes/fpm/php_fpm_5_4_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.4") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_5_spec.rb b/spec/classes/fpm/php_fpm_5_4_5_spec.rb deleted file mode 100644 index 40728f5..0000000 --- a/spec/classes/fpm/php_fpm_5_4_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.5") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_6_spec.rb b/spec/classes/fpm/php_fpm_5_4_6_spec.rb deleted file mode 100644 index ce732c0..0000000 --- a/spec/classes/fpm/php_fpm_5_4_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.6") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_7_spec.rb b/spec/classes/fpm/php_fpm_5_4_7_spec.rb deleted file mode 100644 index 5ff0dd4..0000000 --- a/spec/classes/fpm/php_fpm_5_4_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.7") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_8_spec.rb b/spec/classes/fpm/php_fpm_5_4_8_spec.rb deleted file mode 100644 index 6201c4b..0000000 --- a/spec/classes/fpm/php_fpm_5_4_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.8") - end -end diff --git a/spec/classes/fpm/php_fpm_5_4_9_spec.rb b/spec/classes/fpm/php_fpm_5_4_9_spec.rb deleted file mode 100644 index 7f19339..0000000 --- a/spec/classes/fpm/php_fpm_5_4_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_4_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.4.9") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_0_spec.rb b/spec/classes/fpm/php_fpm_5_5_0_spec.rb deleted file mode 100644 index f2b2164..0000000 --- a/spec/classes/fpm/php_fpm_5_5_0_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_0" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.0") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_10_spec.rb b/spec/classes/fpm/php_fpm_5_5_10_spec.rb deleted file mode 100644 index e1505da..0000000 --- a/spec/classes/fpm/php_fpm_5_5_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.10") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_11_spec.rb b/spec/classes/fpm/php_fpm_5_5_11_spec.rb deleted file mode 100644 index 91c13d6..0000000 --- a/spec/classes/fpm/php_fpm_5_5_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.11") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_12_spec.rb b/spec/classes/fpm/php_fpm_5_5_12_spec.rb deleted file mode 100644 index 794d3b2..0000000 --- a/spec/classes/fpm/php_fpm_5_5_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.12") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_13_spec.rb b/spec/classes/fpm/php_fpm_5_5_13_spec.rb deleted file mode 100644 index c319412..0000000 --- a/spec/classes/fpm/php_fpm_5_5_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.13") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_1_spec.rb b/spec/classes/fpm/php_fpm_5_5_1_spec.rb deleted file mode 100644 index 8034a1a..0000000 --- a/spec/classes/fpm/php_fpm_5_5_1_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_1" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.1") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_2_spec.rb b/spec/classes/fpm/php_fpm_5_5_2_spec.rb deleted file mode 100644 index f346c7b..0000000 --- a/spec/classes/fpm/php_fpm_5_5_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.2") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_3_spec.rb b/spec/classes/fpm/php_fpm_5_5_3_spec.rb deleted file mode 100644 index 8027cdf..0000000 --- a/spec/classes/fpm/php_fpm_5_5_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.3") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_4_spec.rb b/spec/classes/fpm/php_fpm_5_5_4_spec.rb deleted file mode 100644 index f34590b..0000000 --- a/spec/classes/fpm/php_fpm_5_5_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.4") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_5_spec.rb b/spec/classes/fpm/php_fpm_5_5_5_spec.rb deleted file mode 100644 index b3bd13a..0000000 --- a/spec/classes/fpm/php_fpm_5_5_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.5") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_6_spec.rb b/spec/classes/fpm/php_fpm_5_5_6_spec.rb deleted file mode 100644 index 5f63323..0000000 --- a/spec/classes/fpm/php_fpm_5_5_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.6") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_7_spec.rb b/spec/classes/fpm/php_fpm_5_5_7_spec.rb deleted file mode 100644 index afbbd12..0000000 --- a/spec/classes/fpm/php_fpm_5_5_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.7") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_8_spec.rb b/spec/classes/fpm/php_fpm_5_5_8_spec.rb deleted file mode 100644 index a182da2..0000000 --- a/spec/classes/fpm/php_fpm_5_5_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.8") - end -end diff --git a/spec/classes/fpm/php_fpm_5_5_9_spec.rb b/spec/classes/fpm/php_fpm_5_5_9_spec.rb deleted file mode 100644 index f0c5385..0000000 --- a/spec/classes/fpm/php_fpm_5_5_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::fpm::5_5_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__fpm("5.5.9") - end -end diff --git a/spec/classes/fpm/php_fpm_fastcgi_spec.rb b/spec/classes/fpm/php_fpm_fastcgi_spec.rb index 3c8fbfe..7580217 100644 --- a/spec/classes/fpm/php_fpm_fastcgi_spec.rb +++ b/spec/classes/fpm/php_fpm_fastcgi_spec.rb @@ -4,7 +4,7 @@ let(:facts) { default_test_facts } it do - should include_class("nginx::config") + should contain_class("nginx::config") should contain_file("/test/boxen/config/nginx/fastcgi_params").with({ :source => 'puppet:///modules/php/nginx_fastcgi_params', diff --git a/spec/classes/php_5_3_10_spec.rb b/spec/classes/php_5_3_10_spec.rb deleted file mode 100644 index d0cce59..0000000 --- a/spec/classes/php_5_3_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.10") - end -end diff --git a/spec/classes/php_5_3_11_spec.rb b/spec/classes/php_5_3_11_spec.rb deleted file mode 100644 index d3b3bfa..0000000 --- a/spec/classes/php_5_3_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.11") - end -end diff --git a/spec/classes/php_5_3_12_spec.rb b/spec/classes/php_5_3_12_spec.rb deleted file mode 100644 index 9790e71..0000000 --- a/spec/classes/php_5_3_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.12") - end -end diff --git a/spec/classes/php_5_3_13_spec.rb b/spec/classes/php_5_3_13_spec.rb deleted file mode 100644 index f3d3946..0000000 --- a/spec/classes/php_5_3_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.13") - end -end diff --git a/spec/classes/php_5_3_14_spec.rb b/spec/classes/php_5_3_14_spec.rb deleted file mode 100644 index f780be4..0000000 --- a/spec/classes/php_5_3_14_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_14" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.14") - end -end diff --git a/spec/classes/php_5_3_15_spec.rb b/spec/classes/php_5_3_15_spec.rb deleted file mode 100644 index d95ff3d..0000000 --- a/spec/classes/php_5_3_15_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_15" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.15") - end -end diff --git a/spec/classes/php_5_3_16_spec.rb b/spec/classes/php_5_3_16_spec.rb deleted file mode 100644 index 3a5ca56..0000000 --- a/spec/classes/php_5_3_16_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_16" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.16") - end -end diff --git a/spec/classes/php_5_3_17_spec.rb b/spec/classes/php_5_3_17_spec.rb deleted file mode 100644 index c1c1065..0000000 --- a/spec/classes/php_5_3_17_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_17" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.17") - end -end diff --git a/spec/classes/php_5_3_18_spec.rb b/spec/classes/php_5_3_18_spec.rb deleted file mode 100644 index 886a31d..0000000 --- a/spec/classes/php_5_3_18_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_18" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.18") - end -end diff --git a/spec/classes/php_5_3_19_spec.rb b/spec/classes/php_5_3_19_spec.rb deleted file mode 100644 index ac048cd..0000000 --- a/spec/classes/php_5_3_19_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_19" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.19") - end -end diff --git a/spec/classes/php_5_3_20_spec.rb b/spec/classes/php_5_3_20_spec.rb deleted file mode 100644 index f98628d..0000000 --- a/spec/classes/php_5_3_20_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_20" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.20") - end -end diff --git a/spec/classes/php_5_3_21_spec.rb b/spec/classes/php_5_3_21_spec.rb deleted file mode 100644 index ad8517d..0000000 --- a/spec/classes/php_5_3_21_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_21" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.21") - end -end diff --git a/spec/classes/php_5_3_22_spec.rb b/spec/classes/php_5_3_22_spec.rb deleted file mode 100644 index f07c71f..0000000 --- a/spec/classes/php_5_3_22_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_22" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.22") - end -end diff --git a/spec/classes/php_5_3_23_spec.rb b/spec/classes/php_5_3_23_spec.rb deleted file mode 100644 index e6f3089..0000000 --- a/spec/classes/php_5_3_23_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_23" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.23") - end -end diff --git a/spec/classes/php_5_3_24_spec.rb b/spec/classes/php_5_3_24_spec.rb deleted file mode 100644 index ec8fd51..0000000 --- a/spec/classes/php_5_3_24_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_24" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.24") - end -end diff --git a/spec/classes/php_5_3_25_spec.rb b/spec/classes/php_5_3_25_spec.rb deleted file mode 100644 index a79faa6..0000000 --- a/spec/classes/php_5_3_25_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_25" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.25") - end -end diff --git a/spec/classes/php_5_3_26_spec.rb b/spec/classes/php_5_3_26_spec.rb deleted file mode 100644 index 927d586..0000000 --- a/spec/classes/php_5_3_26_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_26" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.26") - end -end diff --git a/spec/classes/php_5_3_27_spec.rb b/spec/classes/php_5_3_27_spec.rb deleted file mode 100644 index 9230fbb..0000000 --- a/spec/classes/php_5_3_27_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_27" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.27") - end -end diff --git a/spec/classes/php_5_3_28_spec.rb b/spec/classes/php_5_3_28_spec.rb deleted file mode 100644 index 18ebc30..0000000 --- a/spec/classes/php_5_3_28_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_28" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.28") - end -end diff --git a/spec/classes/php_5_3_2_spec.rb b/spec/classes/php_5_3_2_spec.rb deleted file mode 100644 index e865626..0000000 --- a/spec/classes/php_5_3_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.2") - end -end diff --git a/spec/classes/php_5_3_3_spec.rb b/spec/classes/php_5_3_3_spec.rb deleted file mode 100644 index 4837a26..0000000 --- a/spec/classes/php_5_3_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.3") - end -end diff --git a/spec/classes/php_5_3_4_spec.rb b/spec/classes/php_5_3_4_spec.rb deleted file mode 100644 index 790c388..0000000 --- a/spec/classes/php_5_3_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.4") - end -end diff --git a/spec/classes/php_5_3_5_spec.rb b/spec/classes/php_5_3_5_spec.rb deleted file mode 100644 index ebad7cd..0000000 --- a/spec/classes/php_5_3_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.5") - end -end diff --git a/spec/classes/php_5_3_6_spec.rb b/spec/classes/php_5_3_6_spec.rb deleted file mode 100644 index a950f7e..0000000 --- a/spec/classes/php_5_3_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.6") - end -end diff --git a/spec/classes/php_5_3_7_spec.rb b/spec/classes/php_5_3_7_spec.rb deleted file mode 100644 index ef21ec0..0000000 --- a/spec/classes/php_5_3_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.7") - end -end diff --git a/spec/classes/php_5_3_8_spec.rb b/spec/classes/php_5_3_8_spec.rb deleted file mode 100644 index 587d4af..0000000 --- a/spec/classes/php_5_3_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.8") - end -end diff --git a/spec/classes/php_5_3_9_spec.rb b/spec/classes/php_5_3_9_spec.rb deleted file mode 100644 index 9b3a466..0000000 --- a/spec/classes/php_5_3_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_3_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.3.9") - end -end diff --git a/spec/classes/php_5_3_spec.rb b/spec/classes/php_5_3_spec.rb deleted file mode 100644 index e58e976..0000000 --- a/spec/classes/php_5_3_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe "php::5_3" do - let(:facts) { default_test_facts } - - it do - should include_class("php") - should include_class("php::5_3_27") - - should contain_file("/test/boxen/phpenv/versions/5.3").with({ - :ensure => "symlink", - :force => true, - :target => "/test/boxen/phpenv/versions/5.3.27" - }) - end -end diff --git a/spec/classes/php_5_4_0_spec.rb b/spec/classes/php_5_4_0_spec.rb deleted file mode 100644 index 406557f..0000000 --- a/spec/classes/php_5_4_0_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_0" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.0") - end -end diff --git a/spec/classes/php_5_4_10_spec.rb b/spec/classes/php_5_4_10_spec.rb deleted file mode 100644 index f651aa1..0000000 --- a/spec/classes/php_5_4_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.10") - end -end diff --git a/spec/classes/php_5_4_11_spec.rb b/spec/classes/php_5_4_11_spec.rb deleted file mode 100644 index a6c37e1..0000000 --- a/spec/classes/php_5_4_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.11") - end -end diff --git a/spec/classes/php_5_4_12_spec.rb b/spec/classes/php_5_4_12_spec.rb deleted file mode 100644 index 42ee1a3..0000000 --- a/spec/classes/php_5_4_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.12") - end -end diff --git a/spec/classes/php_5_4_13_spec.rb b/spec/classes/php_5_4_13_spec.rb deleted file mode 100644 index 0287cde..0000000 --- a/spec/classes/php_5_4_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.13") - end -end diff --git a/spec/classes/php_5_4_14_spec.rb b/spec/classes/php_5_4_14_spec.rb deleted file mode 100644 index 40ddaf5..0000000 --- a/spec/classes/php_5_4_14_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_14" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.14") - end -end diff --git a/spec/classes/php_5_4_15_spec.rb b/spec/classes/php_5_4_15_spec.rb deleted file mode 100644 index 653d367..0000000 --- a/spec/classes/php_5_4_15_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_15" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.15") - end -end diff --git a/spec/classes/php_5_4_16_spec.rb b/spec/classes/php_5_4_16_spec.rb deleted file mode 100644 index 4d69728..0000000 --- a/spec/classes/php_5_4_16_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_16" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.16") - end -end diff --git a/spec/classes/php_5_4_17_spec.rb b/spec/classes/php_5_4_17_spec.rb deleted file mode 100644 index 8cdf70f..0000000 --- a/spec/classes/php_5_4_17_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_17" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.17") - end -end diff --git a/spec/classes/php_5_4_18_spec.rb b/spec/classes/php_5_4_18_spec.rb deleted file mode 100644 index 49fc71e..0000000 --- a/spec/classes/php_5_4_18_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_18" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.18") - end -end diff --git a/spec/classes/php_5_4_19_spec.rb b/spec/classes/php_5_4_19_spec.rb deleted file mode 100644 index ea00af0..0000000 --- a/spec/classes/php_5_4_19_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_19" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.19") - end -end diff --git a/spec/classes/php_5_4_1_spec.rb b/spec/classes/php_5_4_1_spec.rb deleted file mode 100644 index b54f40b..0000000 --- a/spec/classes/php_5_4_1_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_1" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.1") - end -end diff --git a/spec/classes/php_5_4_20_spec.rb b/spec/classes/php_5_4_20_spec.rb deleted file mode 100644 index 92687c8..0000000 --- a/spec/classes/php_5_4_20_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_20" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.20") - end -end diff --git a/spec/classes/php_5_4_21_spec.rb b/spec/classes/php_5_4_21_spec.rb deleted file mode 100644 index 69b4921..0000000 --- a/spec/classes/php_5_4_21_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_21" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.21") - end -end diff --git a/spec/classes/php_5_4_22_spec.rb b/spec/classes/php_5_4_22_spec.rb deleted file mode 100644 index 4d25cbe..0000000 --- a/spec/classes/php_5_4_22_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_22" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.22") - end -end diff --git a/spec/classes/php_5_4_23_spec.rb b/spec/classes/php_5_4_23_spec.rb deleted file mode 100644 index 6c19eb2..0000000 --- a/spec/classes/php_5_4_23_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_23" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.23") - end -end diff --git a/spec/classes/php_5_4_24_spec.rb b/spec/classes/php_5_4_24_spec.rb deleted file mode 100644 index ddf19f1..0000000 --- a/spec/classes/php_5_4_24_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_24" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.24") - end -end diff --git a/spec/classes/php_5_4_25_spec.rb b/spec/classes/php_5_4_25_spec.rb deleted file mode 100644 index 104e56e..0000000 --- a/spec/classes/php_5_4_25_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_25" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.25") - end -end diff --git a/spec/classes/php_5_4_26_spec.rb b/spec/classes/php_5_4_26_spec.rb deleted file mode 100644 index 935c852..0000000 --- a/spec/classes/php_5_4_26_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_26" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.26") - end -end diff --git a/spec/classes/php_5_4_27_spec.rb b/spec/classes/php_5_4_27_spec.rb deleted file mode 100644 index fc22ed8..0000000 --- a/spec/classes/php_5_4_27_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_27" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.27") - end -end diff --git a/spec/classes/php_5_4_28_spec.rb b/spec/classes/php_5_4_28_spec.rb deleted file mode 100644 index 639b9df..0000000 --- a/spec/classes/php_5_4_28_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_28" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.28") - end -end diff --git a/spec/classes/php_5_4_29_spec.rb b/spec/classes/php_5_4_29_spec.rb deleted file mode 100644 index 937d86f..0000000 --- a/spec/classes/php_5_4_29_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_29" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.29") - end -end diff --git a/spec/classes/php_5_4_2_spec.rb b/spec/classes/php_5_4_2_spec.rb deleted file mode 100644 index 8998166..0000000 --- a/spec/classes/php_5_4_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.2") - end -end diff --git a/spec/classes/php_5_4_3_spec.rb b/spec/classes/php_5_4_3_spec.rb deleted file mode 100644 index 725a7b4..0000000 --- a/spec/classes/php_5_4_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.3") - end -end diff --git a/spec/classes/php_5_4_4_spec.rb b/spec/classes/php_5_4_4_spec.rb deleted file mode 100644 index 4034ca8..0000000 --- a/spec/classes/php_5_4_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.4") - end -end diff --git a/spec/classes/php_5_4_5_spec.rb b/spec/classes/php_5_4_5_spec.rb deleted file mode 100644 index a639a72..0000000 --- a/spec/classes/php_5_4_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.5") - end -end diff --git a/spec/classes/php_5_4_6_spec.rb b/spec/classes/php_5_4_6_spec.rb deleted file mode 100644 index c39380e..0000000 --- a/spec/classes/php_5_4_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.6") - end -end diff --git a/spec/classes/php_5_4_7_spec.rb b/spec/classes/php_5_4_7_spec.rb deleted file mode 100644 index 16ea96e..0000000 --- a/spec/classes/php_5_4_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.7") - end -end diff --git a/spec/classes/php_5_4_8_spec.rb b/spec/classes/php_5_4_8_spec.rb deleted file mode 100644 index be884e7..0000000 --- a/spec/classes/php_5_4_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.8") - end -end diff --git a/spec/classes/php_5_4_9_spec.rb b/spec/classes/php_5_4_9_spec.rb deleted file mode 100644 index 8e250d6..0000000 --- a/spec/classes/php_5_4_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_4_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.4.9") - end -end diff --git a/spec/classes/php_5_4_spec.rb b/spec/classes/php_5_4_spec.rb deleted file mode 100644 index 0e1eec3..0000000 --- a/spec/classes/php_5_4_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe "php::5_4" do - let(:facts) { default_test_facts } - - it do - should include_class("php") - should include_class("php::5_4_17") - - should contain_file("/test/boxen/phpenv/versions/5.4").with({ - :ensure => "symlink", - :force => true, - :target => "/test/boxen/phpenv/versions/5.4.17" - }) - end -end diff --git a/spec/classes/php_5_5_0_spec.rb b/spec/classes/php_5_5_0_spec.rb deleted file mode 100644 index 12976d5..0000000 --- a/spec/classes/php_5_5_0_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_0" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.0") - end -end diff --git a/spec/classes/php_5_5_10_spec.rb b/spec/classes/php_5_5_10_spec.rb deleted file mode 100644 index 0b94c07..0000000 --- a/spec/classes/php_5_5_10_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_10" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.10") - end -end diff --git a/spec/classes/php_5_5_11_spec.rb b/spec/classes/php_5_5_11_spec.rb deleted file mode 100644 index 1288392..0000000 --- a/spec/classes/php_5_5_11_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_11" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.11") - end -end diff --git a/spec/classes/php_5_5_12_spec.rb b/spec/classes/php_5_5_12_spec.rb deleted file mode 100644 index 43f806e..0000000 --- a/spec/classes/php_5_5_12_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_12" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.12") - end -end diff --git a/spec/classes/php_5_5_13_spec.rb b/spec/classes/php_5_5_13_spec.rb deleted file mode 100644 index b7cecc3..0000000 --- a/spec/classes/php_5_5_13_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_13" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.13") - end -end diff --git a/spec/classes/php_5_5_1_spec.rb b/spec/classes/php_5_5_1_spec.rb deleted file mode 100644 index 7a21137..0000000 --- a/spec/classes/php_5_5_1_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_1" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.1") - end -end diff --git a/spec/classes/php_5_5_2_spec.rb b/spec/classes/php_5_5_2_spec.rb deleted file mode 100644 index ee2e333..0000000 --- a/spec/classes/php_5_5_2_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_2" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.2") - end -end diff --git a/spec/classes/php_5_5_3_spec.rb b/spec/classes/php_5_5_3_spec.rb deleted file mode 100644 index 82460fb..0000000 --- a/spec/classes/php_5_5_3_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_3" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.3") - end -end diff --git a/spec/classes/php_5_5_4_spec.rb b/spec/classes/php_5_5_4_spec.rb deleted file mode 100644 index 6d564b3..0000000 --- a/spec/classes/php_5_5_4_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_4" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.4") - end -end diff --git a/spec/classes/php_5_5_5_spec.rb b/spec/classes/php_5_5_5_spec.rb deleted file mode 100644 index e86061b..0000000 --- a/spec/classes/php_5_5_5_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_5" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.5") - end -end diff --git a/spec/classes/php_5_5_6_spec.rb b/spec/classes/php_5_5_6_spec.rb deleted file mode 100644 index e54a395..0000000 --- a/spec/classes/php_5_5_6_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_6" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.6") - end -end diff --git a/spec/classes/php_5_5_7_spec.rb b/spec/classes/php_5_5_7_spec.rb deleted file mode 100644 index ca1d55c..0000000 --- a/spec/classes/php_5_5_7_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_7" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.7") - end -end diff --git a/spec/classes/php_5_5_8_spec.rb b/spec/classes/php_5_5_8_spec.rb deleted file mode 100644 index 6bf9657..0000000 --- a/spec/classes/php_5_5_8_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_8" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.8") - end -end diff --git a/spec/classes/php_5_5_9_spec.rb b/spec/classes/php_5_5_9_spec.rb deleted file mode 100644 index 4dde25f..0000000 --- a/spec/classes/php_5_5_9_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'spec_helper' - -describe "php::5_5_9" do - let(:facts) { default_test_facts } - - it do - should contain_php__version("5.5.9") - end -end diff --git a/spec/classes/php_composer_spec.rb b/spec/classes/php_composer_spec.rb index 9100930..edb4729 100644 --- a/spec/classes/php_composer_spec.rb +++ b/spec/classes/php_composer_spec.rb @@ -4,11 +4,11 @@ let(:facts) { default_test_facts } it do - should include_class("php") + should contain_class("php") should contain_exec("download-php-composer").with({ - :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha8/composer.phar", - :unless => "[ -f /test/boxen/phpenv/bin/composer ] && [ \"`md5 -q /test/boxen/phpenv/bin/composer`\" = \"df1001975035f07d09307bf1f1e62584\" ]", + :command => "curl -sS -o /test/boxen/phpenv/bin/composer https://getcomposer.org/download/1.0.0-alpha9/composer.phar", + :unless => "[ -f /test/boxen/phpenv/bin/composer ] && [ \"`md5 -q /test/boxen/phpenv/bin/composer`\" = \"05df355b5277c8c9012470e699fa5494\" ]", :cwd => "/test/boxen/phpenv", :require => "Exec[phpenv-setup-root-repo]" }) diff --git a/spec/classes/php_config_spec.rb b/spec/classes/php_config_spec.rb index 9fbad3a..c253c9b 100644 --- a/spec/classes/php_config_spec.rb +++ b/spec/classes/php_config_spec.rb @@ -4,6 +4,6 @@ let(:facts) { default_test_facts } it do - should include_class("boxen::config") + should contain_class("boxen::config") end end diff --git a/spec/classes/php_global_spec.rb b/spec/classes/php_global_spec.rb index 08474d0..6b8173c 100644 --- a/spec/classes/php_global_spec.rb +++ b/spec/classes/php_global_spec.rb @@ -9,8 +9,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_file("/test/boxen/phpenv/version").with({ :ensure => "present", diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb index 369dfb2..a48f976 100644 --- a/spec/classes/php_spec.rb +++ b/spec/classes/php_spec.rb @@ -5,15 +5,15 @@ let(:phpenv_version) { "6499bb6c7b645af3f4e67f7e17708d5ee208453f" } it do - should include_class("php::config") - should include_class("homebrew") - should include_class("stdlib") - should include_class("wget") - should include_class("autoconf") - should include_class("libtool") - should include_class("pkgconfig") - should include_class("pcre") - should include_class("libpng") + should contain_class("boxen::config") + should contain_class("homebrew") + should contain_class("stdlib") + should contain_class("wget") + should contain_class("autoconf") + should contain_class("libtool") + should contain_class("pkgconfig") + should contain_class("pcre") + should contain_class("libpng") should contain_package("phpenv").with({ :ensure => "absent" diff --git a/spec/defines/extensions/php_extension_apc_spec.rb b/spec/defines/extensions/php_extension_apc_spec.rb index 7eab8c6..f0ac172 100644 --- a/spec/defines/extensions/php_extension_apc_spec.rb +++ b/spec/defines/extensions/php_extension_apc_spec.rb @@ -11,8 +11,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("apc for 5.4.17").with({ :extension => "apc", diff --git a/spec/defines/extensions/php_extension_couchbase_spec.rb b/spec/defines/extensions/php_extension_couchbase_spec.rb index b00378a..1aa29ab 100644 --- a/spec/defines/extensions/php_extension_couchbase_spec.rb +++ b/spec/defines/extensions/php_extension_couchbase_spec.rb @@ -12,9 +12,9 @@ end it do - should include_class("couchbase::lib") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("couchbase::lib") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_repository("/test/boxen/data/php/cache/extensions/couchbase").with({ :source => "couchbase/php-ext-couchbase" diff --git a/spec/defines/extensions/php_extension_imagick_spec.rb b/spec/defines/extensions/php_extension_imagick_spec.rb index 11533de..0666e4a 100644 --- a/spec/defines/extensions/php_extension_imagick_spec.rb +++ b/spec/defines/extensions/php_extension_imagick_spec.rb @@ -12,9 +12,9 @@ end it do - should include_class("php::config") - should include_class("imagemagick") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_class("imagemagick") + should contain_php__version("5.4.17") should contain_php_extension("imagick for 5.4.17").with({ :extension => "imagick", diff --git a/spec/defines/extensions/php_extension_intl_spec.rb b/spec/defines/extensions/php_extension_intl_spec.rb index ff9a183..3b73953 100644 --- a/spec/defines/extensions/php_extension_intl_spec.rb +++ b/spec/defines/extensions/php_extension_intl_spec.rb @@ -11,8 +11,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("intl for 5.4.17").with({ :extension => "intl", diff --git a/spec/defines/extensions/php_extension_mcrypt_spec.rb b/spec/defines/extensions/php_extension_mcrypt_spec.rb index 1b455df..f801208 100644 --- a/spec/defines/extensions/php_extension_mcrypt_spec.rb +++ b/spec/defines/extensions/php_extension_mcrypt_spec.rb @@ -10,8 +10,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("mcrypt for 5.4.17").with({ :provider => "php_source", diff --git a/spec/defines/extensions/php_extension_memcached_spec.rb b/spec/defines/extensions/php_extension_memcached_spec.rb index 9df9bda..762db0d 100644 --- a/spec/defines/extensions/php_extension_memcached_spec.rb +++ b/spec/defines/extensions/php_extension_memcached_spec.rb @@ -12,10 +12,10 @@ end it do - should include_class("boxen::config") - should include_class("memcached::lib") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("boxen::config") + should contain_class("memcached::lib") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("memcached for 5.4.17").with({ :extension => "memcached", diff --git a/spec/defines/extensions/php_extension_mssql_spec.rb b/spec/defines/extensions/php_extension_mssql_spec.rb index 866058e..ad3ec48 100644 --- a/spec/defines/extensions/php_extension_mssql_spec.rb +++ b/spec/defines/extensions/php_extension_mssql_spec.rb @@ -10,9 +10,9 @@ end it do - should include_class("php::dependencies::freetds") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::dependencies::freetds") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("mssql for 5.4.17").with({ :provider => "php_source", diff --git a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb index 2a3d896..64a34fa 100644 --- a/spec/defines/extensions/php_extension_pdo_dblib_spec.rb +++ b/spec/defines/extensions/php_extension_pdo_dblib_spec.rb @@ -10,9 +10,9 @@ end it do - should include_class("php::dependencies::freetds") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::dependencies::freetds") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("pdo_dblib for 5.4.17").with({ :provider => "php_source", diff --git a/spec/defines/extensions/php_extension_pecl_http_spec.rb b/spec/defines/extensions/php_extension_pecl_http_spec.rb index 2adf3bd..f78cb2f 100644 --- a/spec/defines/extensions/php_extension_pecl_http_spec.rb +++ b/spec/defines/extensions/php_extension_pecl_http_spec.rb @@ -12,9 +12,9 @@ end it do - should include_class("boxen::config") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("boxen::config") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("pecl_http for 5.4.17").with({ :extension => "pecl_http", diff --git a/spec/defines/extensions/php_extension_pgsql_spec.rb b/spec/defines/extensions/php_extension_pgsql_spec.rb index 554e3d4..cb60e94 100644 --- a/spec/defines/extensions/php_extension_pgsql_spec.rb +++ b/spec/defines/extensions/php_extension_pgsql_spec.rb @@ -10,8 +10,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("pgsql for 5.4.17").with({ :provider => "php_source", diff --git a/spec/defines/extensions/php_extension_pspell_spec.rb b/spec/defines/extensions/php_extension_pspell_spec.rb new file mode 100644 index 0000000..a51ae4b --- /dev/null +++ b/spec/defines/extensions/php_extension_pspell_spec.rb @@ -0,0 +1,31 @@ +require 'spec_helper' + +describe "php::extension::pspell" do + let(:facts) { default_test_facts } + let(:title) { "pspell for 5.4.17" } + let(:params) do + { + :php => "5.4.17", + } + end + + it do + should contain_class("php::config") + should contain_class("aspell") + should contain_php__version("5.4.17") + + should contain_php_extension("pspell for 5.4.17").with({ + :provider => "php_source", + :extension => "pspell", + :homebrew_path => "/test/boxen/homebrew", + :phpenv_root => "/test/boxen/phpenv", + :php_version => "5.4.17", + :configure_params => "--with-pspell=/test/boxen/homebrew/opt/aspell", + }) + + should contain_file("/test/boxen/config/php/5.4.17/conf.d/pspell.ini").with({ + :content => File.read("spec/fixtures/pspell.ini"), + :require => "Php_extension[pspell for 5.4.17]" + }) + end +end diff --git a/spec/defines/extensions/php_extension_pthreads_spec.rb b/spec/defines/extensions/php_extension_pthreads_spec.rb new file mode 100644 index 0000000..2bcc91c --- /dev/null +++ b/spec/defines/extensions/php_extension_pthreads_spec.rb @@ -0,0 +1,32 @@ +require 'spec_helper' + +describe "php::extension::pthreads" do + let(:facts) { default_test_facts } + let(:title) { "pthreads for 5.4.17" } + let(:params) do + { + :php => "5.4.17", + :version => "2.0.10" + } + end + + it do + should contain_class("php::config") + should contain_php__version("5.4.17") + + should contain_php_extension("pthreads for 5.4.17").with({ + :extension => "pthreads", + :version => "2.0.10", + :package_name => "pthreads-2.0.10", + :package_url => "http://pecl.php.net/get/pthreads-2.0.10.tgz", + :homebrew_path => "/test/boxen/homebrew", + :phpenv_root => "/test/boxen/phpenv", + :php_version => "5.4.17", + }) + + should contain_file("/test/boxen/config/php/5.4.17/conf.d/pthreads.ini").with({ + :content => File.read("spec/fixtures/pthreads.ini"), + :require => "Php_extension[pthreads for 5.4.17]" + }) + end +end diff --git a/spec/defines/extensions/php_extension_redis_spec.rb b/spec/defines/extensions/php_extension_redis_spec.rb index 90bf0b3..86b4f93 100644 --- a/spec/defines/extensions/php_extension_redis_spec.rb +++ b/spec/defines/extensions/php_extension_redis_spec.rb @@ -12,9 +12,9 @@ end it do - should include_class("redis") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("redis") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_repository("/test/boxen/data/php/cache/extensions/redis").with({ :source => "nicolasff/phpredis" diff --git a/spec/defines/extensions/php_extension_ssh2_spec.rb b/spec/defines/extensions/php_extension_ssh2_spec.rb new file mode 100644 index 0000000..f7525ff --- /dev/null +++ b/spec/defines/extensions/php_extension_ssh2_spec.rb @@ -0,0 +1,36 @@ +require 'spec_helper' + +describe "php::extension::ssh2" do + let(:facts) { default_test_facts } + let(:title) { "ssh2 for 5.4.17" } + let(:params) do + { + :php => "5.4.17", + :version => "0.12" + } + end + + it do + should contain_class("boxen::config") + should contain_class("php::config") + should contain_php__version("5.4.17") + + should contain_php_extension("ssh2 for 5.4.17").with({ + :extension => "ssh2", + :version => "0.12", + :package_name => "ssh2-0.12", + :package_url => "http://pecl.php.net/get/ssh2-0.12.tgz", + :homebrew_path => "/test/boxen/homebrew", + :phpenv_root => "/test/boxen/phpenv", + :php_version => "5.4.17", + :cache_dir => "/test/boxen/data/php/cache/extensions", + :provider => "pecl", + :require => "Package[libssh2]" + }) + + should contain_file("/test/boxen/config/php/5.4.17/conf.d/ssh2.ini").with({ + :content => File.read("spec/fixtures/ssh2.ini"), + :require => "Php_extension[ssh2 for 5.4.17]" + }) + end +end diff --git a/spec/defines/extensions/php_extension_stats_spec.rb b/spec/defines/extensions/php_extension_stats_spec.rb new file mode 100644 index 0000000..9dd45cb --- /dev/null +++ b/spec/defines/extensions/php_extension_stats_spec.rb @@ -0,0 +1,33 @@ +require 'spec_helper' + +describe "php::extension::stats" do + let(:facts) { default_test_facts } + let(:title) { "stats for 5.4.17" } + let(:params) do + { + :php => "5.4.17", + :version => "1.0.3" + } + end + + it do + should contain_class("php::config") + should contain_php__version("5.4.17") + + should contain_php_extension("stats for 5.4.17").with({ + :extension => "stats", + :version => "1.0.3", + :package_name => "stats-1.0.3", + :package_url => "http://pecl.php.net/get/stats-1.0.3.tgz", + :homebrew_path => "/test/boxen/homebrew", + :phpenv_root => "/test/boxen/phpenv", + :php_version => "5.4.17", + :cache_dir => "/test/boxen/data/php/cache/extensions", + }) + + should contain_file("/test/boxen/config/php/5.4.17/conf.d/stats.ini").with({ + :content => File.read("spec/fixtures/stats.ini"), + :require => "Php_extension[stats for 5.4.17]" + }) + end +end diff --git a/spec/defines/extensions/php_extension_xdebug_spec.rb b/spec/defines/extensions/php_extension_xdebug_spec.rb index fd5e0fe..4763874 100644 --- a/spec/defines/extensions/php_extension_xdebug_spec.rb +++ b/spec/defines/extensions/php_extension_xdebug_spec.rb @@ -11,8 +11,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("xdebug for 5.4.17").with({ :extension => "xdebug", diff --git a/spec/defines/extensions/php_extension_xhprof_spec.rb b/spec/defines/extensions/php_extension_xhprof_spec.rb index a5c2638..7753911 100644 --- a/spec/defines/extensions/php_extension_xhprof_spec.rb +++ b/spec/defines/extensions/php_extension_xhprof_spec.rb @@ -11,8 +11,8 @@ end it do - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("xhprof for 5.4.17").with({ :extension => "xhprof", diff --git a/spec/defines/extensions/php_extension_zmq_spec.rb b/spec/defines/extensions/php_extension_zmq_spec.rb index 1d3488f..599d8df 100644 --- a/spec/defines/extensions/php_extension_zmq_spec.rb +++ b/spec/defines/extensions/php_extension_zmq_spec.rb @@ -12,9 +12,9 @@ end it do - should include_class("zeromq") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("zeromq") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_repository("/test/boxen/data/php/cache/extensions/zmq").with({ :source => "mkoppanen/php-zmq" diff --git a/spec/defines/extensions/php_extension_zookeeper_spec.rb b/spec/defines/extensions/php_extension_zookeeper_spec.rb index 52a422f..bd08e89 100644 --- a/spec/defines/extensions/php_extension_zookeeper_spec.rb +++ b/spec/defines/extensions/php_extension_zookeeper_spec.rb @@ -12,10 +12,10 @@ end it do - should include_class("boxen::config") - should include_class("zookeeper") - should include_class("php::config") - should include_class("php::5_4_17") + should contain_class("boxen::config") + should contain_class("zookeeper") + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_php_extension("zookeeper for 5.4.17").with({ :extension => "zookeeper", diff --git a/spec/defines/fpm/php_fpm_pool_spec.rb b/spec/defines/fpm/php_fpm_pool_spec.rb index cf643c6..9cc0b0c 100644 --- a/spec/defines/fpm/php_fpm_pool_spec.rb +++ b/spec/defines/fpm/php_fpm_pool_spec.rb @@ -14,8 +14,8 @@ end it do - should include_class("php::config") - should include_class("php::fpm::5_4_17") + should contain_class("php::config") + should contain_php__fpm("5.4.17") should contain_file("/test/boxen/config/php/5.4.17/pool.d/5_4_17_for_test.conf").with({ :content => File.read("spec/fixtures/php-fpm-pool-custom.conf"), diff --git a/spec/defines/fpm/php_fpm_service_spec.rb b/spec/defines/fpm/php_fpm_service_spec.rb index 1e392b0..c032ab8 100644 --- a/spec/defines/fpm/php_fpm_service_spec.rb +++ b/spec/defines/fpm/php_fpm_service_spec.rb @@ -11,9 +11,9 @@ } end it do - should include_class("php::config") - should include_class("nginx::config") - should include_class("php::fpm::fastcgi") + should contain_class("php::config") + should contain_class("nginx::config") + should contain_class("php::fpm::fastcgi") should contain_file("/Library/LaunchDaemons/dev.php-fpm.5.4.17.plist").with({ :content => File.read("spec/fixtures/dev.php-fpm.plist"), diff --git a/spec/defines/php_fpm_spec.rb b/spec/defines/php_fpm_spec.rb index 8f91b63..628316d 100644 --- a/spec/defines/php_fpm_spec.rb +++ b/spec/defines/php_fpm_spec.rb @@ -13,7 +13,7 @@ end it do - should include_class("php::5_4_17") + should contain_php__version("5.4.17") should contain_file("/test/boxen/config/php/5.4.17/php-fpm.conf").with({ :content => File.read("spec/fixtures/php-fpm.conf"), diff --git a/spec/defines/php_local_spec.rb b/spec/defines/php_local_spec.rb index 4c348d1..8a6d264 100644 --- a/spec/defines/php_local_spec.rb +++ b/spec/defines/php_local_spec.rb @@ -12,8 +12,8 @@ end it do - should include_class("php::config") - should include_class('php::5_4_17') + should contain_class("php::config") + should contain_php__version("5.4.17") should contain_file('/tmp/.php-version').with({ :ensure => "present", @@ -31,7 +31,7 @@ end it do - should include_class("php::config") + should contain_class("php::config") should contain_file('/tmp/.php-version').with_ensure('absent') end end diff --git a/spec/defines/php_project_spec.rb b/spec/defines/php_project_spec.rb index 6f07212..7e7f252 100644 --- a/spec/defines/php_project_spec.rb +++ b/spec/defines/php_project_spec.rb @@ -11,31 +11,31 @@ let(:params) { default_test_params } it do - should include_class("boxen::config") + should contain_class("boxen::config") should contain_repository("/Users/testuser/src/testproject").with({ :source => "testuser/testproject-repo" }) - should_not include_class("elasticsearch") - should_not include_class("memcached") - should_not include_class("mongodb") - should_not include_class("cassandra") - should_not include_class("beanstalk") - should_not include_class("zookeeper") - should_not include_class("zeromq") - should_not include_class("nsq") + should_not contain_class("elasticsearch") + should_not contain_class("memcached") + should_not contain_class("mongodb") + should_not contain_class("cassandra") + should_not contain_class("beanstalk") + should_not contain_class("zookeeper") + should_not contain_class("zeromq") + should_not contain_class("nsq") should_not contain_mysql__db - should_not include_class("nginx::config") - should_not include_class("nginx") + should_not contain_class("nginx::config") + should_not contain_class("nginx") should_not contain_file("/test/boxen/config/nginx/sites/testproject.conf") should_not contain_nodejs__local("/Users/testuser/src/testproject") should_not contain_postgresql__db - should_not include_class("redis") + should_not contain_class("redis") should_not contain_ruby__local("/Users/testuser/src/testproject") @@ -66,7 +66,7 @@ }) end - it { should include_class("elasticsearch") } + it { should contain_class("elasticsearch") } end context "memcached => true" do @@ -77,7 +77,7 @@ }) end - it { should include_class("memcached") } + it { should contain_class("memcached") } end context "mongodb => true" do @@ -88,7 +88,7 @@ }) end - it { should include_class("mongodb") } + it { should contain_class("mongodb") } end context "cassandra => true" do @@ -99,7 +99,7 @@ }) end - it { should include_class("cassandra") } + it { should contain_class("cassandra") } end context "beanstalk => true" do @@ -110,7 +110,7 @@ }) end - it { should include_class("beanstalk") } + it { should contain_class("beanstalk") } end context "zookeeper => true" do @@ -121,7 +121,7 @@ }) end - it { should include_class("zookeeper") } + it { should contain_class("zookeeper") } end context "zeromq => true" do @@ -132,7 +132,7 @@ }) end - it { should include_class("zeromq") } + it { should contain_class("zeromq") } end context "nsq => true" do @@ -143,7 +143,7 @@ }) end - it { should include_class("nsq") } + it { should contain_class("nsq") } end context "mysql => a_database_name" do @@ -164,8 +164,8 @@ end it do - should include_class("nginx::config") - should include_class("nginx") + should contain_class("nginx::config") + should contain_class("nginx") should contain_file("/test/boxen/config/nginx/sites/testproject.conf").with({ :content => File.read("spec/fixtures/nginx.conf"), @@ -215,7 +215,7 @@ class sysctl {} }) end - it { should include_class("redis") } + it { should contain_class("redis") } end context "ruby => 2.0.0" do diff --git a/spec/defines/php_version_spec.rb b/spec/defines/php_version_spec.rb index b1a8cf4..1b0db9c 100644 --- a/spec/defines/php_version_spec.rb +++ b/spec/defines/php_version_spec.rb @@ -5,8 +5,8 @@ let(:title) { "5.4.17" } it do - should include_class("php") - should include_class("boxen::config") + should contain_class("php") + should contain_class("boxen::config") end context 'ensure => installed' do diff --git a/spec/fixtures/Puppetfile b/spec/fixtures/Puppetfile index d8ba1f0..f67471d 100644 --- a/spec/fixtures/Puppetfile +++ b/spec/fixtures/Puppetfile @@ -11,3 +11,5 @@ mod "libpng", "1.0.0", :github_tarball => "boxen/puppet-libpng" mod "mysql", "1.1.3", :github_tarball => "boxen/puppet-mysql" mod "postgresql", "2.0.1", :github_tarball => "boxen/puppet-postgresql" mod "nginx", "1.4.2", :github_tarball => "boxen/puppet-nginx" +mod "module_data", "0.0.3", :github_tarball => "ripienaar/puppet-module-data" +mod "aspell", "0.0.1", :github_tarball => "namesco/puppet-aspell" diff --git a/spec/fixtures/Puppetfile.lock b/spec/fixtures/Puppetfile.lock index ef51276..e2fdbab 100644 --- a/spec/fixtures/Puppetfile.lock +++ b/spec/fixtures/Puppetfile.lock @@ -58,17 +58,29 @@ GITHUBTARBALL specs: wget (1.0.0) +GITHUBTARBALL + remote: namesco/puppet-aspell + specs: + aspell (0.0.1) + GITHUBTARBALL remote: puppetlabs/puppetlabs-stdlib specs: stdlib (4.1.0) +GITHUBTARBALL + remote: ripienaar/puppet-module-data + specs: + module_data (0.0.3) + DEPENDENCIES + aspell (= 0.0.1) autoconf (= 1.0.0) boxen (= 3.0.2) homebrew (= 1.4.1) libpng (= 1.0.0) libtool (= 1.0.0) + module_data (= 0.0.3) mysql (= 1.1.3) nginx (= 1.4.2) pcre (= 1.0.0) diff --git a/spec/fixtures/hiera/hiera.yaml b/spec/fixtures/hiera/hiera.yaml new file mode 100644 index 0000000..0350eed --- /dev/null +++ b/spec/fixtures/hiera/hiera.yaml @@ -0,0 +1,6 @@ +--- +:hierarchy: + - test + +:yaml: + :datadir: 'spec/fixtures/hiera' diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml new file mode 100644 index 0000000..4cff9a1 --- /dev/null +++ b/spec/fixtures/hiera/test.yaml @@ -0,0 +1,19 @@ +--- +php::config::root: "/test/boxen/phpenv" +php::config::logdir: "/test/boxen/log/php" +php::config::configdir: "/test/boxen/config/php" +php::config::datadir: "/test/boxen/data/php" +php::config::pluginsdir: "/test/boxen/phpenv/plugins" +php::config::cachedir: "/test/boxen/data/php/cache" +php::config::extensioncachedir: "/test/boxen/data/php/cache/extensions" +php::config::configure_params: {} +php::config::composer: + version: '1.0.0-alpha9' + checksum: '05df355b5277c8c9012470e699fa5494' +php::config::phpenv: + revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f' +php::config::secure_versions: + '5.6': '5.6.9' + '5.5': '5.5.25' + '5.4': '5.4.41' +php::config::secure_warning: true diff --git a/spec/fixtures/pspell.ini b/spec/fixtures/pspell.ini new file mode 100644 index 0000000..618a051 --- /dev/null +++ b/spec/fixtures/pspell.ini @@ -0,0 +1 @@ +extension=/test/boxen/phpenv/versions/5.4.17/modules/pspell.so diff --git a/spec/fixtures/pthreads.ini b/spec/fixtures/pthreads.ini new file mode 100644 index 0000000..d7b01c2 --- /dev/null +++ b/spec/fixtures/pthreads.ini @@ -0,0 +1 @@ +extension=/test/boxen/phpenv/versions/5.4.17/modules/pthreads.so diff --git a/spec/fixtures/ssh2.ini b/spec/fixtures/ssh2.ini new file mode 100644 index 0000000..b5ac3e9 --- /dev/null +++ b/spec/fixtures/ssh2.ini @@ -0,0 +1 @@ +extension=/test/boxen/phpenv/versions/5.4.17/modules/ssh2.so diff --git a/spec/fixtures/stats.ini b/spec/fixtures/stats.ini new file mode 100644 index 0000000..e7af3d0 --- /dev/null +++ b/spec/fixtures/stats.ini @@ -0,0 +1 @@ +extension=/test/boxen/phpenv/versions/5.4.17/modules/stats.so diff --git a/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb b/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb new file mode 100644 index 0000000..f861b8b --- /dev/null +++ b/spec/lib/puppet/parser/functions/php_fpm_require_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe "the php_fpm_require function" do + before :all do + Puppet::Parser::Functions.autoloader.loadall + end + + it "should exist" do + Puppet::Parser::Functions.function("php_fpm_require").should == "function_php_fpm_require" + end +end diff --git a/spec/lib/puppet/parser/functions/php_require_spec.rb b/spec/lib/puppet/parser/functions/php_require_spec.rb new file mode 100644 index 0000000..6145659 --- /dev/null +++ b/spec/lib/puppet/parser/functions/php_require_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe "the php_require function" do + before :all do + Puppet::Parser::Functions.autoloader.loadall + end + + it "should exist" do + Puppet::Parser::Functions.function("php_require").should == "function_php_require" + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index feedaf8..3f6240c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,9 +2,12 @@ fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) +$: << File.join(fixture_path, 'modules/module_data/lib') + RSpec.configure do |c| c.module_path = File.join(fixture_path, 'modules') c.manifest_dir = File.join(fixture_path, 'manifests') + c.hiera_config = File.join(fixture_path, 'hiera/hiera.yaml') end def default_test_facts