Recommit for updates in build 64

doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html

@@ -122,10 +122,10 @@
 class puppet_cd::puppetdb::service (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::puppetdb::files
 
-    service { $pt_puppetdb:
+    service { $pt_db_service:
       ensure     => running,
       hasstatus  => true,
       hasrestart => true,

doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html

@@ -137,19 +137,7 @@
 39
 40
 41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54</pre>
+42</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -180,18 +168,6 @@ class puppet_cd::server::service (
     }
   }
 
-  # manage puppetdb service
-  if $fqdn == $pt_db_fqdn {
-    require puppet_cd::firewall::iptables
-
-    service { $pt_db_service:
-      ensure     =&gt; running,
-      hasstatus  =&gt; true,
-      hasrestart =&gt; true,
-      enable     =&gt; true,
-    }
-  }
-
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install