adjust travis.yml and fix permissions for debian os

Signed-off-by: Patrick Münch <[email protected]>

Author: atomic111

.kitchen.yml

@@ -39,9 +39,9 @@ platforms:
 - name: oracle-6.7
   driver:
     image: oraclelinux:6.7
-- name: oracle-7.1
+- name: oracle-7
   driver:
-    image: oraclelinux:7.1
+    image: oraclelinux:7
     pid_one_command: /usr/lib/systemd/systemd
 - name: debian-7
   driver:
@@ -82,7 +82,8 @@ suites:
   - fedora-23
   - fedora-24
   - oracle-6.7
-  - oracle-7.1
+  - oracle-7
+  - debian-7
   attributes:
     postgresql:
       enable_pgdg_apt: true
@@ -98,7 +99,7 @@ suites:
   verifier:
     inspec_tests:
       - https://github.com/dev-sec/postgres-baseline
-- name: default-apt_9.1
+- name: default-apt91
   run_list:
   - recipe[postgresql::server]
   - recipe[postgres-hardening]
@@ -113,7 +114,7 @@ suites:
   - fedora-23
   - fedora-24
   - oracle-6.7
-  - oracle-7.1
+  - oracle-7
   attributes:
     postgresql:
       enable_pgdg_apt: true

.travis.yml

@@ -21,16 +21,39 @@ matrix:
   - rvm: 2.3.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
-    env: SUITE=test:integration OS='centos'
+    env: SUITE=test:integration OS='centos-6.7'
   - rvm: 2.3.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
-    env: SUITE=test:integration OS='oracle'
+    env: SUITE=test:integration OS='centos-7'
   - rvm: 2.3.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
-    env: SUITE=test:integration OS='ubuntu'
+    env: SUITE=test:integration OS='oracle-6.7'
   - rvm: 2.3.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
-    env: SUITE=test:integration OS='debian'
+    env: SUITE=test:integration OS='oracle-7'
+  - rvm: 2.3.3
+    bundler_args: "--without guard tools"
+    script: bundle exec rake $SUITE
+    env: SUITE=test:integration OS='ubuntu-12.04'
+  - rvm: 2.3.3
+    bundler_args: "--without guard tools"
+    script: bundle exec rake $SUITE
+    env: SUITE=test:integration OS='ubuntu-14.04'
+  - rvm: 2.3.3
+    bundler_args: "--without guard tools"
+    script: bundle exec rake $SUITE
+    env: SUITE=test:integration OS='ubuntu-16.04'
+  - rvm: 2.3.3
+    bundler_args: "--without guard tools"
+    script: bundle exec rake $SUITE
+    env: SUITE=test:integration OS='debian-7'
+  - rvm: 2.3.3
+    bundler_args: "--without guard tools"
+    script: bundle exec rake $SUITE
+    env: SUITE=test:integration OS='debian-8'
+  allow-failures:
+  - env: SUITE=test:integration OS='fedora-24'
+  - env: SUITE=test:integration OS='fedora-23'

Berksfile

@@ -4,6 +4,6 @@ source 'https://supermarket.getchef.com'
 
 metadata
 
-cookbook 'postgresql', '>= 4.0.6'
+cookbook 'postgresql', '>= 6.0.0'
 cookbook 'apt'
 cookbook 'chef-solo-search', git: 'https://github.com/edelight/chef-solo-search'

recipes/hardening.rb

@@ -25,6 +25,9 @@
     directory File.join('/var/lib/postgresql/', dir) do
       mode '0700'
     end
+    directory File.join('/etc/postgresql/', node['postgresql']['version'], 'main') do
+      mode '0700'
+    end
   end
 
   change_notify = node['postgresql']['server']['config_change_notify']