Update the poise and postgresql cookbooks

This commit is contained in:
Greg Karékinian 2019-04-03 15:28:06 +02:00
parent 448bffe34e
commit 374d6bc975
12 changed files with 26 additions and 14 deletions

View File

@ -20,7 +20,7 @@ cookbook 'application', '~> 5.2.0'
cookbook 'application_javascript', '~> 1.0.0' cookbook 'application_javascript', '~> 1.0.0'
cookbook 'application_ruby', '~> 4.1.0' cookbook 'application_ruby', '~> 4.1.0'
cookbook 'application_git', '= 1.1.0' # 1.2.0 doesn't work with knife-solo cookbook 'application_git', '= 1.1.0' # 1.2.0 doesn't work with knife-solo
cookbook 'poise', '~> 2.8.1' cookbook 'poise', '~> 2.8.2'
cookbook 'poise-languages', '~> 2.1.1' cookbook 'poise-languages', '~> 2.1.1'
cookbook 'poise-ruby', '~> 2.4.0' cookbook 'poise-ruby', '~> 2.4.0'
cookbook 'poise-javascript', git: 'https://github.com/poise/poise-javascript.git', cookbook 'poise-javascript', git: 'https://github.com/poise/poise-javascript.git',
@ -33,7 +33,7 @@ cookbook 'firewall', '~> 2.6.3'
cookbook 'nginx', '= 9.0.0' cookbook 'nginx', '= 9.0.0'
cookbook 'build-essential', '~> 8.1.1' cookbook 'build-essential', '~> 8.1.1'
cookbook 'mysql', '= 6.1.3' cookbook 'mysql', '= 6.1.3'
cookbook 'postgresql', '= 7.1.3' cookbook 'postgresql', '= 7.1.4'
cookbook 'apt', '~> 7.0.0' cookbook 'apt', '~> 7.0.0'
cookbook 'git', '= 6.0.0' cookbook 'git', '= 6.0.0'
cookbook 'hostsfile', '= 2.4.5' cookbook 'hostsfile', '= 2.4.5'

View File

@ -39,7 +39,7 @@ DEPENDENCIES
openssl (= 7.1.0) openssl (= 7.1.0)
php (= 4.2.0) php (= 4.2.0)
php-fpm (= 0.7.9) php-fpm (= 0.7.9)
poise (= 2.8.1) poise (~> 2.8.2)
poise-archive (~> 1.5.0) poise-archive (~> 1.5.0)
poise-javascript (~> 1.2.0) poise-javascript (~> 1.2.0)
poise-languages (= 2.1.1) poise-languages (= 2.1.1)
@ -47,7 +47,7 @@ DEPENDENCIES
poise-ruby-build (= 1.1.0) poise-ruby-build (= 1.1.0)
poise-service (~> 1.5.2) poise-service (~> 1.5.2)
postfix (= 5.0.2) postfix (= 5.0.2)
postgresql (= 7.1.3) postgresql (= 7.1.4)
redis redis
git: https://github.com/phlipper/chef-redis.git git: https://github.com/phlipper/chef-redis.git
revision: 7476279fc9c8727f082b8d77b5e1922dc2ef437b revision: 7476279fc9c8727f082b8d77b5e1922dc2ef437b
@ -155,7 +155,7 @@ GRAPH
php-fpm (0.7.9) php-fpm (0.7.9)
apt (>= 0.0.0) apt (>= 0.0.0)
yum (>= 3.0) yum (>= 3.0)
poise (2.8.1) poise (2.8.2)
poise-archive (1.5.0) poise-archive (1.5.0)
poise (~> 2.6) poise (~> 2.6)
poise-build-essential (1.0.0) poise-build-essential (1.0.0)
@ -180,7 +180,7 @@ GRAPH
poise-service (1.5.2) poise-service (1.5.2)
poise (~> 2.0) poise (~> 2.0)
postfix (5.0.2) postfix (5.0.2)
postgresql (7.1.3) postgresql (7.1.4)
rbac (1.0.3) rbac (1.0.3)
redis (0.5.6) redis (0.5.6)
apt (>= 0.0.0) apt (>= 0.0.0)

View File

@ -1,5 +1,10 @@
# Changelog # Changelog
## v2.8.2
* Remove support for Chef before 12.14.
* Fixed compatibility with Chef 14.3.
## v2.8.1 ## v2.8.1
* Fix a missing `require` when using `subclass_providers!` on Chef 12.3. * Fix a missing `require` when using `subclass_providers!` on Chef 12.3.

View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
# #
require 'poise'
require 'poise/error' require 'poise/error'
require 'poise/utils' require 'poise/utils'

View File

@ -217,8 +217,8 @@ module Poise
def included(klass) def included(klass)
super super
klass.extend(ClassMethods) klass.extend(ClassMethods)
klass.const_get(:HIDDEN_IVARS) << :@subcontexts klass.const_set(:HIDDEN_VARS, klass.const_get(:HIDDEN_IVARS) + [:@subcontexts])
klass.const_get(:FORBIDDEN_IVARS) << :@subcontexts klass.const_set(:FORBIDDEN_IVARS, klass.const_get(:FORBIDDEN_IVARS) + [:@subcontexts])
end end
end end

View File

@ -16,5 +16,5 @@
module Poise module Poise
VERSION = '2.8.1' VERSION = '2.8.2'
end end

File diff suppressed because one or more lines are too long

View File

@ -4,6 +4,10 @@ This file is used to list changes made in the last 3 major versions of the postg
## Unreleased ## Unreleased
## v7.1.4 (28-03-2019)
- Fix installation of extensions.
## v7.1.3 (15-01-2019) ## v7.1.3 (15-01-2019)
- Added support for dash in database role name. - Added support for dash in database role name.

View File

@ -1,6 +1,8 @@
# PostgreSQL cookbook # PostgreSQL cookbook
[![CircleCI](https://circleci.com/gh/sous-chefs/postgresql/tree/master.svg?style=svg)](https://circleci.com/gh/sous-chefs/postgresql/tree/master) [![Cookbook Version](https://img.shields.io/cookbook/v/postgresql.svg)](https://supermarket.chef.io/cookbooks/postgresql) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge) [![Cookbook Version](https://img.shields.io/cookbook/v/postgresql.svg)](https://supermarket.chef.io/cookbooks/postgresql)
[![Build Status](https://img.shields.io/circleci/project/github/sous-chefs/postgresql/master.svg)](https://circleci.com/gh/sous-chefs/postgresql)
[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
Installs and configures PostgreSQL as a client or a server. Installs and configures PostgreSQL as a client or a server.

View File

@ -71,7 +71,7 @@ module PostgresqlCookbook
if new_resource.version if new_resource.version
version_result.stdout == new_resource.version version_result.stdout == new_resource.version
else else
!version_result.stdout.nil? !version_result.stdout.chomp.empty?
end end
end end

File diff suppressed because one or more lines are too long

View File

@ -5,7 +5,7 @@ maintainer_email 'help@sous-chefs.org'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures postgresql for clients or servers' description 'Installs and configures postgresql for clients or servers'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '7.1.3' version '7.1.4'
source_url 'https://github.com/sous-chefs/postgresql' source_url 'https://github.com/sous-chefs/postgresql'
issues_url 'https://github.com/sous-chefs/postgresql/issues' issues_url 'https://github.com/sous-chefs/postgresql/issues'
chef_version '>= 13.8' chef_version '>= 13.8'