Merge pull request #31 from jordiprats/master

bugfix varis
NTTCom-MS · Jan 16, 2018 · 2f5d1d5 · 2f5d1d5
2 parents 48be78a + fc144d7
commit 2f5d1d5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.1.45
+
+* bugfix datadir on CentOS 7
+
+## 0.1.44
+
+* dependency bugfix archive command
+
 ## 0.1.43
 
 * dependency bugfix for **postgresql::pgstatsstatements**

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -63,6 +63,13 @@
   # postgres >= 9.5
   # max_wal_size = (3 * checkpoint_segments) * 16MB
 
+  if($postgresql::params::systemd)
+  {
+    systemd::service::dropin { $postgresql::params::servicename[$version]:
+      env_vars => [ "PGDATA=${datadir_path}" ],
+    }
+  }
+
 
   concat { "${datadir_path}/postgresql.conf":
     ensure => 'present',

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -106,6 +106,7 @@
     exec { "mkdir -p ${archive_dir} postgres archive command ${version} ${datadir_path}":
       command => "mkdir -p ${archive_dir}",
       creates => $archive_dir,
+      require => Class['::postgresql::install'],
       before  => Class['::postgresql::service'],
     }
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -52,6 +52,7 @@
           {
             /^6.*$/:
             {
+              $systemd=false
               $reposource =  {
                               '9.2' => 'https://download.postgresql.org/pub/repos/yum/9.2/redhat/rhel-6-x86_64/pgdg-redhat92-9.2-8.noarch.rpm',
                               '9.6' => 'https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-6-x86_64/pgdg-redhat96-9.6-3.noarch.rpm',
@@ -63,6 +64,7 @@
             }
             /^7.*$/:
               {
+                $systemd=true
                 $reposource =  {
                                 '9.2' => 'https://download.postgresql.org/pub/repos/yum/9.2/redhat/rhel-7-x86_64/pgdg-redhat92-9.2-3.noarch.rpm',
                                 '9.6' => 'https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-redhat96-9.6-3.noarch.rpm',
@@ -81,6 +83,7 @@
           {
             /^6.*$/:
             {
+              $systemd=false
               $reposource =  {
                               '9.2' => 'http://download.postgresql.org/pub/repos/yum/9.2/redhat/rhel-6-x86_64/pgdg-centos92-9.2-7.noarch.rpm',
                               '9.6' => 'https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-6-x86_64/pgdg-centos96-9.6-3.noarch.rpm',
@@ -93,6 +96,7 @@
             }
             /^7.*$/:
             {
+              $systemd=true
               $reposource =  {
                               '9.2' => 'https://download.postgresql.org/pub/repos/yum/9.2/redhat/rhel-7-x86_64/pgdg-centos92-9.2-3.noarch.rpm',
                               '9.6' => 'https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm',

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-postgresql",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "author": "eyp",
   "summary": "postgresql installation and management",
   "license": "Apache-2.0",
@@ -10,6 +10,7 @@
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.12.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.2.3"},
+    {"name":"eyp/systemd","version_requirement":">= 0.1.35 < 0.2.0"},
     {"name":"eyp/eyplib","version_requirement":">= 0.1.0 < 0.2.0"}
   ],
   "operatingsystem_support": [