Fix PostgreSQL support on CentOS and Fedora

Author: zuazo

.kitchen.docker.yml

@@ -5,7 +5,6 @@ driver:
 
 # If you add new platforms below, include them in the .travis.yml file matrix
 platforms:
-- name: centos-5
 - name: centos-6
 - name: centos-7
 - name: debian-7

.kitchen.yml

@@ -15,17 +15,22 @@ platforms:
  run_list: ["recipe[apt]"]
 - name: ubuntu-14.04
  run_list: ["recipe[apt]"]
-- name: ubuntu-14.10
+- name: ubuntu-16.04
  run_list: ["recipe[apt]"]
-- name: debian-7.8
+- name: ubuntu-16.10
  run_list: ["recipe[apt]"]
-- name: debian-8.7
+- name: debian-7.11
  run_list: ["recipe[apt]"]
-- name: centos-6.6
+- name: debian-8.6
+ run_list: ["recipe[apt]"]
+- name: centos-6.8
+ run_list: ["recipe[selinux::disabled]"]
+- name: centos-7.3
  run_list: ["recipe[selinux::disabled]"]
-- name: centos-7.0
+- name: fedora-23
+- name: fedora-24
  run_list: ["recipe[selinux::disabled]"]
-- name: fedora-20
+- name: fedora-25
  run_list: ["recipe[selinux::disabled]"]
 
 suites:
@@ -66,7 +71,12 @@ suites:
  # - ubuntu-12.04
  # - debian-6.0.10
  # - debian-7.8
- # - centos-6.6
  # - fedora-20
+ # File "/.../chef-12.19.36/lib/chef/provider/package/dnf/dnf_helper.py", line 56, in query
+ # pkgs = q.latest(1).run() TypeError: latest() takes 1 positional argument but 2 were given
+ - fedora-23
+ # Unknown system type: Linux 3.16.0-4-amd64
+ - centos-6
+ - centos-7
  run_list:
  - recipe[postfix-dovecot_test::postfix_postgresql]

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - README: Remove documentation about locale (old).
 
 ### Fixed
+- Fix PostgreSQL support on CentOS and Fedora.
 - Fix Chef `13` deprecation warnings.
 
 ## [2.0.1] - 2015-09-03

README.md

@@ -26,11 +26,14 @@ Please, [let us know](https://github.com/zuazo/postfix-dovecot-cookbook/issues/n
 
 ## Required Cookbooks
 
+* [chef-vault](https://supermarket.chef.io/cookbooks/chef-vault)
+* [build-essential](https://supermarket.chef.io/cookbooks/build-essential)
 * [dovecot](https://supermarket.chef.io/cookbooks/dovecot)
 * [onddo-spamassassin](https://supermarket.chef.io/cookbooks/onddo-spamassassin)
 * [postfixadmin](https://supermarket.chef.io/cookbooks/postfixadmin)
 * [postfix-full](https://supermarket.chef.io/cookbooks/postfix-full) by [Malte Swart](https://github.com/mswart)
 * [ssl_certificate](https://supermarket.chef.io/cookbooks/ssl_certificate)
+* [yum](https://supermarket.chef.io/cookbooks/yum)
 
 ## Required Applications
 

attributes/postfix_postgresql.rb

@@ -28,20 +28,20 @@
  srpm_default['packages'] = %w(
  postgresql-devel rpm-build zlib-devel openldap-devel libdb-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mariadb-devel
+ mariadb-devel pkgconfig ed
  )
  srpm_default['rpm_regexp'] = [
- /\.src\./, ".centos.#{node['kernel']['machine']}."
+ /\.src\./, ".#{node['platform']}.#{node['kernel']['machine']}."
  ]
  srpm_default['rpm_build_args'] = '--with=pgsql'
  else
  srpm_default['packages'] = %w(
  postgresql-devel rpm-build zlib-devel openldap-devel db4-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mysql-devel
+ mysql-devel pkgconfig ed
  )
  srpm_default['rpm_regexp'] = [
- /_[0-9]+\.src\./, ".#{node['kernel']['machine']}."
+ /_[0-9]+(\.[0-9]+)?\.src\./, "\\1.#{node['kernel']['machine']}."
  ]
  srpm_default['rpm_build_args'] = '--define="PGSQL 1"'
 
@@ -76,8 +76,9 @@
  srpm_default['packages'] = %w(
  postgresql-devel rpm-build zlib-devel openldap-devel libdb-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mariadb-devel
+ mariadb-devel pkgconfig ed libicu-devel sqlite-devel tinycdb-devel
  )
+
  srpm_default['rpm_regexp'] = [
  /\.src\./, ".#{node['kernel']['machine']}."
  ]
@@ -90,7 +91,7 @@
  srpm_default['packages'] = %w(
  postgresql-devel rpm-build zlib-devel openldap-devel db4-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mysql-devel
+ mysql-devel pkgconfig ed
  )
  srpm_default['rpm_regexp'] = [
  /\.src\./, ".#{node['kernel']['machine']}."

metadata.rb

@@ -54,6 +54,7 @@
 recipe 'postfix-dovecot::dovecot', 'Installs and configures Dovecot 2.'
 
 depends 'chef-vault', '~> 2.0'
+depends 'build-essential', '~> 8.0'
 depends 'dovecot', '~> 3.0'
 depends 'onddo-spamassassin', '~> 1.0'
 depends 'postfixadmin', '~> 3.0'

recipes/postfix_postgresql.rb

@@ -19,11 +19,12 @@
 # limitations under the License.
 #
 
-case node['platform']
-when 'debian', 'ubuntu'
+if %w(debian ubuntu).include?(node['platform']) ||
+ (node['platform'] == 'fedora' && node['platform_version'].to_i >= 23)
  package 'postfix'
  package 'postfix-pgsql'
-when 'centos', 'fedora', 'redhat', 'amazon', 'scientific'
+elsif %w(centos fedora redhat amazon scientific).include?(node['platform'])
+ include_recipe 'build-essential'
 
  node['postfix-dovecot']['postfix']['srpm']['packages'].each do |pkg|
  package pkg
@@ -90,6 +91,7 @@
 
  rpm_regexp = node['postfix-dovecot']['postfix']['srpm']['rpm_regexp']
  rpm = rpm_regexp.nil? ? srpm : srpm.sub(rpm_regexp[0], rpm_regexp[1])
+ rpm_file = "#{buildroot}/RPMS/#{node['kernel']['machine']}/#{rpm}"
 
  yum_package 'postfix (without postgresql)' do
  package_name 'postfix'
@@ -107,7 +109,7 @@
  end
 
  execute 'install postfix from SRPM' do
- command "rpm -i '#{buildroot}/RPMS/#{node['kernel']['machine']}/#{rpm}'"
+ command "rpm -i '#{rpm_file}'"
  not_if { rpm.nil? }
  not_if 'rpm -q postfix'
  end

test/unit/recipes/postfix_postgresql_spec.rb

@@ -90,9 +90,7 @@
  node.set['postfix-dovecot']['postfix']['srpm']['rpm_regexp'] =
  rpm_regexp
  expect(chef_run).to run_execute('install postfix from SRPM')
- .with_command(
- "rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'"
- )
+ .with_command("rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'")
  end
  end
 
@@ -122,7 +120,10 @@
  end
 
  context 'with CentOS 7' do
- let(:rpm) { "foobar-1.0_19.centos.#{node['kernel']['machine']}.tar.gz" }
+ let(:rpm) do
+ "postfix-2.10.1-6.el7.centos.#{node['kernel']['machine']}.rpm"
+ end
+ let(:srpm) { 'postfix-2.10.1-6.el7.src.rpm' }
  let(:rpmbuild_args) { '--with=pgsql' }
  before do
  node.automatic['platform'] = 'centos'
@@ -132,7 +133,7 @@
  %w(
  postgresql-devel rpm-build zlib-devel openldap-devel libdb-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mariadb-devel
+ mariadb-devel pkgconfig ed
  ).each do |pkg|
  it "installs #{pkg} package" do
  expect(chef_run).to install_package(pkg)
@@ -141,9 +142,7 @@
 
  it 'installs the correct RPM' do
  expect(chef_run).to run_execute('install postfix from SRPM')
- .with_command(
- "rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'"
- )
+ .with_command("rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'")
  end
 
  it 'uses the correct rpmbuild args' do
@@ -155,7 +154,8 @@
  end # context on CentOS 7
 
  context 'with CentOS 6' do
- let(:rpm) { "foobar-1.0.#{node['kernel']['machine']}.tar.gz" }
+ let(:rpm) { "postfix-2.6.6-6.el6.1.#{node['kernel']['machine']}.rpm" }
+ let(:srpm) { 'postfix-2.6.6-6.el6_7.1.src.rpm' }
  let(:rpmbuild_args) { '--define="PGSQL 1"' }
  before do
  node.automatic['platform'] = 'centos'
@@ -165,7 +165,7 @@
  %w(
  postgresql-devel rpm-build zlib-devel openldap-devel db4-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mysql-devel
+ mysql-devel pkgconfig ed
  ).each do |pkg|
  it "installs #{pkg} package" do
  expect(chef_run).to install_package(pkg)
@@ -174,9 +174,7 @@
 
  it 'installs the correct RPM' do
  expect(chef_run).to run_execute('install postfix from SRPM')
- .with_command(
- "rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'"
- )
+ .with_command("rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'")
  end
 
  it 'uses the correct rpmbuild args' do
@@ -208,7 +206,7 @@
  %w(
  postgresql-devel rpm-build zlib-devel openldap-devel libdb-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mariadb-devel
+ mariadb-devel pkgconfig ed libicu-devel sqlite-devel tinycdb-devel
  ).each do |pkg|
  it "installs #{pkg} package" do
  expect(chef_run).to install_package(pkg)
@@ -217,9 +215,7 @@
 
  it 'installs the correct RPM' do
  expect(chef_run).to run_execute('install postfix from SRPM')
- .with_command(
- "rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'"
- )
+ .with_command("rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'")
  end
 
  it 'uses the correct rpmbuild args' do
@@ -230,6 +226,22 @@
  end
  end # context on Fedora
 
+ context 'with Fedora 24' do
+ before do
+ node.automatic['platform'] = 'fedora'
+ node.automatic['platform_version'] = '23.0'
+ end
+
+ %w(
+ postfix
+ postfix-pgsql
+ ).each do |pkg|
+ it "installs #{pkg} package" do
+ expect(chef_run).to install_package(pkg)
+ end
+ end
+ end # context on Fedora 23
+
  context 'with Amazon' do
  let(:pc_shell_out) { instance_double('Mixlib::ShellOut') }
  let(:gr_shell_out) { instance_double('Mixlib::ShellOut') }
@@ -286,7 +298,7 @@
  %w(
  postgresql-devel rpm-build zlib-devel openldap-devel db4-devel
  cyrus-sasl-devel pcre-devel openssl-devel perl-Date-Calc gcc
- mysql-devel
+ mysql-devel pkgconfig ed
  ).each do |pkg|
  it "installs #{pkg} package" do
  expect(chef_run).to install_package(pkg)
@@ -295,9 +307,7 @@
 
  it 'installs the correct RPM' do
  expect(chef_run).to run_execute('install postfix from SRPM')
- .with_command(
- "rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'"
- )
+ .with_command("rpm -i '#{buildroot}/RPMS/x86_64/#{rpm}'")
  end
 
  it 'uses the correct rpmbuild args' do