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

Auto-merge for build 12

See merge request puppet/postgresql_cd!9

doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html

@@ -105,7 +105,11 @@
 7
 8
 9
-10</pre>
+10
+11
+12
+13
+14</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -113,7 +117,11 @@
 class postgresql_cd::main::config (
 
 ) inherits postgresql_cd::params {
-  include postgresql_cd::server::service
+  include postgresql_cd::main::install
+
+  if $fqdn == $pl_server_fqdn {
+    include postgresql_cd::server::service
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html

@@ -115,7 +115,8 @@
 17
 18
 19
-20</pre>
+20
+21</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -126,6 +127,7 @@ class postgresql_cd::server::service (
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
     require postgresql_cd::server::initdb
+    require postgresql_cd::pghba::pg_hba
 
     service { $pl_service:
       ensure     =&gt; running,

manifests/main/config.pp

@@ -6,5 +6,9 @@
 class postgresql_cd::main::config (
 
 ) inherits postgresql_cd::params {
-  include postgresql_cd::server::service
+  include postgresql_cd::main::install
+
+  if $fqdn == $pl_server_fqdn {
+    include postgresql_cd::server::service
+  }
 }

manifests/server/service.pp

@@ -9,6 +9,7 @@ class postgresql_cd::server::service (
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
     require postgresql_cd::server::initdb
+    require postgresql_cd::pghba::pg_hba
 
     service { $pl_service:
       ensure     => running,