diff --git a/manifests/main/config.pp b/manifests/main/config.pp
index 9b193ff..5a8f2e2 100644
--- a/manifests/main/config.pp
+++ b/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
+  }
 }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 41e425a..6de0ece 100644
--- a/manifests/server/service.pp
+++ b/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,