Recommit for updates in build 57

doc/_index.html

@@ -73,11 +73,6 @@
       
             </li>
     
-            <li>
-      <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
-      
-            </li>
-    
             <li>
       <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>
       
@@ -103,11 +98,6 @@
       
             </li>
     
-            <li>
-      <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
-      
-            </li>
-    
             <li>
       <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
       

doc/puppet_class_list.html

@@ -43,55 +43,41 @@
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::firewall::iptables" class="even">
+    <li id="object_puppet_classes::puppet_cd::main::config" class="even">
-      <div class="item">
-        <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
-      </div>
-    </li>
-    
-
-    <li id="object_puppet_classes::puppet_cd::main::config" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::main::dirs" class="even">
+    <li id="object_puppet_classes::puppet_cd::main::dirs" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::puppet_cd::main::dirs (puppet_class)">puppet_cd::main::dirs</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::main::files" class="odd">
+    <li id="object_puppet_classes::puppet_cd::main::files" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::puppet_cd::main::files (puppet_class)">puppet_cd::main::files</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::main::install" class="even">
+    <li id="object_puppet_classes::puppet_cd::main::install" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::main::user" class="odd">
+    <li id="object_puppet_classes::puppet_cd::main::user" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::params" class="even">
-      <div class="item">
-        <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
-      </div>
-    </li>
-    
-
     <li id="object_puppet_classes::puppet_cd::puppetdb::dirs" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   
@@ -164,7 +164,29 @@
 66
 67
 68
-69</pre>
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -191,6 +213,7 @@ class puppet_cd::r10k::install (
     package { &#39;r10k&#39;:
       ensure   =&gt; $pt_pkg_ensure,
       provider =&gt; gem,
+      require  =&gt; Package[$pt_r10k_pkg],
     }
 
     # create r10k dir
@@ -219,16 +242,37 @@ class puppet_cd::r10k::install (
       require  =&gt; File[&#39;r10k_dir&#39;],
       content  =&gt; template($pt_r10k_erb),
     }
+
     if $pt_use_r10k_webhook == true {
-      file { $pt_r10k_webhook_pkg:
+      package { $pt_r10k_webhook_pkg:
-        ensure =&gt; file,
+        ensure   =&gt; present,
-        source =&gt; &#39;puppet:///modules/puppet_cd/webhook-go.rpm&#39;
+        provider =&gt; gem,
+        require  =&gt; Package[$pt_r10k_pkg],
       }
 
-      exec { &#39;install rpm&#39;:
+      exec { &#39;create symlink&#39;:
-        command =&gt; &quot;yum install -y ${pt_r10k_webhook_pkg}&quot;,
+        command =&gt; $pt_webhook_link,
-        unless  =&gt; &#39;rpm -qa | grep webhook-go&#39;,
+        creates =&gt; &#39;/usr/bin/r10k_gitlab_webhook&#39;,
-        require =&gt; File[$pt_r10k_webhook_pkg],
+        path    =&gt; [&#39;/bin&#39;, &#39;/usr/bin&#39;],
+        require =&gt; Package[$pt_r10k_webhook_pkg],
+      }
+
+      file { $pt_webhook_service_file:
+        ensure   =&gt; file,
+        owner    =&gt; &#39;root&#39;,
+        group    =&gt; &#39;root&#39;,
+        mode     =&gt; &#39;0664&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; puppet_etc_t,
+        seluser  =&gt; unconfined_u,
+        content  =&gt; template($pt_webhook_service_erb),
+        notify   =&gt; [Service[$pt_r10k_webhook_service],Exec[&#39;systemctl-daemon-reload&#39;]],
+      }
+
+      exec { &#39;systemctl-daemon-reload&#39;:
+        command     =&gt; &#39;/bin/systemctl daemon-reload&#39;,
+        refreshonly =&gt; true,
       }
     }
   }

doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
+    <dd>puppet_cd::params</dd>
   </dl>
   
   
@@ -149,8 +149,7 @@
 51
 52
 53
-54
+54</pre>
-55</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -196,8 +195,7 @@ class puppet_cd::server::service (
   # manage webhook service
   if $pt_use_r10k_webhook == true {
     require puppet_cd::r10k::install
-
+    service { $pt_r10k_webhook_service:
-    service { $pt_webhook_service:
       ensure     =&gt; running,
       hasstatus  =&gt; true,
       hasrestart =&gt; true,