Showing with 31 additions and 21 deletions.
  1. +1 −1 .msync.yml
  2. +17 −1 CHANGELOG.md
  3. +1 −1 Gemfile
  4. +1 −1 manifests/extension/config.pp
  5. +1 −1 manifests/fpm/pool.pp
  6. +1 −1 metadata.json
  7. +0 −4 spec/classes/coverage_spec.rb
  8. +0 −1 spec/default_facts.yml
  9. +9 −10 spec/spec_helper.rb
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '2.1.0'
modulesync_config_version: '2.2.0'
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v6.0.1](https://github.com/voxpupuli/puppet-php/tree/v6.0.1) (2018-10-07)
## [v6.0.2](https://github.com/voxpupuli/puppet-php/tree/v6.0.2) (2018-10-14)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v6.0.1...v6.0.2)

**Fixed bugs:**

- allow `latest` for php extensions again [\#485](https://github.com/voxpupuli/puppet-php/pull/485) ([amateo](https://github.com/amateo))

**Closed issues:**

- Ubuntu 18.04 issue just installing [\#475](https://github.com/voxpupuli/puppet-php/issues/475)

**Merged pull requests:**

- Remove readable permissions for others on fpm pool config file [\#484](https://github.com/voxpupuli/puppet-php/pull/484) ([l-lotz](https://github.com/l-lotz))

## [v6.0.1](https://github.com/voxpupuli/puppet-php/tree/v6.0.1) (2018-10-06)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v6.0.0...v6.0.1)

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ end

group :test do
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
gem 'rspec-puppet-utils', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
Expand Down
2 changes: 1 addition & 1 deletion manifests/extension/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
}

$config_root_ini = pick_default($php::config_root_ini, $php::params::config_root_ini)
if $ensure == 'present' or $ensure == 'installed' {
if $ensure == 'present' or $ensure == 'installed' or $ensure == 'latest' {
::php::config { $title:
file => "${config_root_ini}/${ini_prefix}${ini_name}.ini",
config => $final_settings,
Expand Down
2 changes: 1 addition & 1 deletion manifests/fpm/pool.pp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
content => template($template),
owner => root,
group => $root_group,
mode => '0644',
mode => '0640',
}
}
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-php",
"version": "6.0.1",
"version": "6.0.2",
"author": "Vox Pupuli",
"summary": "Generic PHP module that supports many platforms",
"license": "MIT",
Expand Down
4 changes: 0 additions & 4 deletions spec/classes/coverage_spec.rb

This file was deleted.

1 change: 0 additions & 1 deletion spec/default_facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
# if a same named fact exists in facterdb it will be overridden.
---
concat_basedir: "/tmp"
ipaddress: "172.16.254.254"
is_pe: false
macaddress: "AA:AA:AA:AA:AA:AA"
19 changes: 9 additions & 10 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
include RspecPuppetFacts

# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
include RspecPuppetFacts

if Dir.exist?(File.expand_path('../../lib', __FILE__))
require 'coveralls'
Expand All @@ -23,13 +22,13 @@
end

RSpec.configure do |c|
default_facts = {
puppetversion: Puppet.version,
facterversion: Facter.version
}
default_facts = {}
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
c.default_facts = default_facts
end

# vim: syntax=ruby
# Coverage generation
c.after(:suite) do
RSpec::Puppet::Coverage.report!
end
end