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

Auto-merge for build 26

See merge request puppet/postgresql_cd!23

doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Afiles.html

@@ -121,21 +121,7 @@
 23
 24
 25
-26
+26</pre>
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -147,20 +133,6 @@ class postgresql_cd::main::files (
     require postgresql_cd::server::initdb
     require postgresql_cd::main::dirs
 
-    # outsourced to pghba::pghba for concatenation
-#    file { &#39;/var/lib/pgsql/data/pg_hba.conf&#39;:
-#      ensure   =&gt; file,
-#      owner    =&gt; &#39;postgres&#39;,
-#      group    =&gt; &#39;postgres&#39;,
-#      mode     =&gt; &#39;0600&#39;,
-#      selrange =&gt; s0,
-#      selrole  =&gt; object_r,
-#      seltype  =&gt; postgresql_db_t,
-#      seluser  =&gt; unconfined_u,
-#      content  =&gt; template(&#39;postgresql_cd/pg_hba.conf.erb&#39;),
-#      notify   =&gt; Service[$pl_service],
-#    }
-
     file { &#39;/var/lib/pgsql/data/postgresql.conf&#39;:
       ensure   =&gt; file,
       owner    =&gt; &#39;postgres&#39;,

manifests/main/files.pp

@@ -10,20 +10,6 @@ class postgresql_cd::main::files (
     require postgresql_cd::server::initdb
     require postgresql_cd::main::dirs
 
-    # outsourced to pghba::pghba for concatenation
-#    file { '/var/lib/pgsql/data/pg_hba.conf':
-#      ensure   => file,
-#      owner    => 'postgres',
-#      group    => 'postgres',
-#      mode     => '0600',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => postgresql_db_t,
-#      seluser  => unconfined_u,
-#      content  => template('postgresql_cd/pg_hba.conf.erb'),
-#      notify   => Service[$pl_service],
-#    }
-
     file { '/var/lib/pgsql/data/postgresql.conf':
       ensure   => file,
       owner    => 'postgres',