Merge branch 'jenkins-build-17' into 'master'

Auto-merge for build 17

See merge request puppet/postgresql_cd!14

doc/puppet_classes/postgresql_cd_3A_3Aparams.html

@@ -435,7 +435,8 @@
 62
 63
 64
-65</pre>
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 23</span>
@@ -477,8 +478,9 @@ class postgresql_cd::params (
   $pl_data_dir              = &#39;/var/lib/pgsql/data/&#39;
 
   # files
-  $pl_pg_hba_conf        = &quot;${pl_data_dir}/pg_hba.conf&quot;
-  $pl_pg_hba_rule_conf      = &#39;postgresql_cd/pg_hba_rule.conf.erb&#39;
+  $pl_pg_hba_conf           = &quot;${pl_data_dir}/pg_hba.conf&quot;
+  $pl_pg_hba_rule_conf      = &#39;postgresql_cd/server/pghba/pg_hba_rule.conf.erb&#39;
+  $pl_pg_hba_conf_erb       = &#39;postgresql_cd/server/pghba/pg_hba.conf.erb&#39;
 
   # includes must be last
   include postgresql_cd::main::config

manifests/params.pp

@@ -57,8 +57,9 @@ class postgresql_cd::params (
   $pl_data_dir              = '/var/lib/pgsql/data/'
 
   # files
-  $pl_pg_hba_conf        = "${pl_data_dir}/pg_hba.conf"
-  $pl_pg_hba_rule_conf      = 'postgresql_cd/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf           = "${pl_data_dir}/pg_hba.conf"
+  $pl_pg_hba_rule_conf      = 'postgresql_cd/server/pghba/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf_erb       = 'postgresql_cd/server/pghba/pg_hba.conf.erb'
 
   # includes must be last
   include postgresql_cd::main::config