Add postgresql::hba_entry and postgresql::var

1 files changed, 15 insertions, 8 deletions

diff --git a/modules/postgresql/manifests/server.pp b/modules/postgresql/manifests/server.pp
index 8089bb4c..85f5dda5 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -1,15 +1,14 @@
 class postgresql::server {
-    $pgsql_data = '/var/lib/pgsql/data/'
-    $pg_version = '9.0'
+    include postgresql::var
 
     # missing requires is corrected in cooker,
     # should be removed
     # once the fix is in a stable release
-    package { "postgresql${pg_version}-plpgsql":
+    package { "postgresql${postgresql::var::pg_version}-plpgsql":
         alias => 'postgresql-plpgsql',
     }
 
-    package { "postgresql${pg_version}-server":
+    package { "postgresql${postgresql::var::pg_version}-server":
         alias   => 'postgresql-server',
         require => Package['postgresql-plpgsql'],
     }
@@ -24,7 +23,7 @@ class postgresql::server {
 
     openssl::self_signed_splitted_cert { "pgsql.$::domain":
         filename  => 'server',
-        directory => $pgsql_data,
+        directory => $postgresql::var::pgsql_data,
         owner     => 'postgres',
         group     => 'postgres',
         require   => Package['postgresql-server']
@@ -35,12 +34,20 @@ class postgresql::server {
         content => template('postgresql/pam'),
     }
 
-    postgresql::pg_hba { "${pgsql_data}/pg_hba.conf": }
+    @postgresql::pg_hba { $postgresql::var::hba_file: }
+
+    postgresql::hba_entry { 'allow_local_ipv4':
+        type => 'host',
+        database => 'all',
+        user => 'all',
+        address => '127.0.0.1/32',
+        method => 'md5',
+    }
 
     postgresql::config {
-        "$pgsql_data/pg_ident.conf":
+        "${postgresql::var::pgsql_data}/pg_ident.conf":
             content => template('postgresql/pg_ident.conf');
-        "$pgsql_data/postgresql.conf":
+        "${postgresql::var::pgsql_data}/postgresql.conf":
             content => template('postgresql/postgresql.conf');
     }
 }