From de82d794306ac6531207835edd861ca50ed9f0e2 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sun, 7 Nov 2010 13:04:26 +0000
Subject: - add a alias not dependent on the pogsql version - do not reload on
 restart ( as this may have side effect ) - explicitly ask for reload on
 config file change ( with exec service reload ) - use shorter name for file,
 with a common variable

---
 modules/postgresql/manifests/init.pp | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/modules/postgresql/manifests/init.pp b/modules/postgresql/manifests/init.pp
index 0bee7b72..7c22c986 100644
--- a/modules/postgresql/manifests/init.pp
+++ b/modules/postgresql/manifests/init.pp
@@ -1,15 +1,25 @@
 class postgresql {
+    
+    $pgsql_data = "/var/lib/pgsql/data/"
+
     package { 'postgresql9.0-server':
+        alias => "postgresql-server",
         ensure => installed
     }
 
     service { postgresql:
         ensure => running,
-        subscribe => Package["postgresql9.0-server"],
-        restart => "/etc/rc.d/init.d/postgresql reload",
+        subscribe => Package["postgresql-server"],
         hasstatus => true,
     }
 
+    exec { "service postgresql reload":
+        refreshonly => true,
+        subscribe => [ File["postgresql.conf"], 
+                       File["pg_ident.conf"],
+                       File["pg_hba.conf"] ]
+    }
+
     file { '/etc/pam.d/postgresql':
         ensure => present,
         owner  => root,
@@ -18,33 +28,33 @@ class postgresql {
         content => template("postgresql/pam"),
     }
 
-    file { '/var/lib/pgsql/data/postgresql.conf':
+    file { "postgresql.conf":
+        path => "$pgsql_data/$name",
         ensure => present,
         owner => postgres,
         group => postgres,
         mode => 600,
         content => template("postgresql/postgresql.conf"),
-        require => Package["postgresql9.0-server"],
-        notify => [Service["postgresql"]]
+        require => Package["postgresql-server"],
     }
     
-    file { '/var/lib/pgsql/data/pg_hba.conf':
+    file { 'pg_hba.conf':
+        path => "$pgsql_data/$name",
         ensure => present,
         owner => postgres,
         group => postgres,
         mode => 600,
         content => template("postgresql/pg_hba.conf"),
-        require => Package["postgresql9.0-server"],
-        notify => [Service["postgresql"]]
+        require => Package["postgresql-server"],
     }
 
-    file { '/var/lib/pgsql/data/pg_ident.conf':
+    file { 'pg_ident.conf':
+        path => "$pgsql_data/$name",
         ensure => present,
         owner => postgres,
         group => postgres,
         mode => 600,
         content => template("postgresql/pg_ident.conf"),
-        require => Package["postgresql9.0-server"],
-        notify => [Service["postgresql"]]
+        require => Package["postgresql-server"],
     }
 }
-- 
cgit v1.2.1