Recommit for updates in build 27

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -1674,7 +1674,11 @@
 242
 243
 244
-245</pre>
+245
+246
+247
+248
+249</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
@@ -1797,6 +1801,7 @@ class puppet_cd::params (
   $pt_puppetdb_var_dir              = &#39;/opt/puppetlabs/server/data/puppetdb&#39;
 ## r10k
   $pt_r10k_dir                      = &quot;${pt_main_dir}/r10k&quot;
+  $pt_r10k_webhook_dir              = &#39;/etc/r10k-webhook&#39;
 
 # files
 ## puppet
@@ -1826,12 +1831,15 @@ class puppet_cd::params (
   $pt_r10k_file                     = &quot;${pt_r10k_dir}/r10k.yaml&quot;
   $pt_r10k_erb                      = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
   $pt_r10k_hook_file                = &#39;/usr/local/bin/webhook&#39;
+  $pt_r10k_hook_config_file         = &quot;${pt_r10k_webhook_dir}/hooks.json&quot;
+  $pt_r10k_hook_config_erb          = &#39;puppet_cd/r10k/hook_config.erb&#39;
+  $pt_r10k_hook_service_file        = &#39;/etc/systemd/system/webhook.service&#39;
+  $pt_r10k_hook_service_erb         = &#39;puppet_cd/r10k/r10k_webhook_service.erb&#39;
 
 # service
   $pt_server_service                = &#39;puppetserver&#39;
   $pt_agent_service                 = &#39;puppet&#39;
   $pt_db_service                    = &#39;puppetdb&#39;
-  $pt_r10k_wb_service               = &#39;r10k-webhook&#39;
 
 #
   # includes must be last

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html

@@ -125,7 +125,43 @@
 27
 28
 29
-30</pre>
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span>
@@ -147,12 +183,48 @@ class puppet_cd::r10k::webhook (
       source   =&gt; &#39;puppet:///modules/puppet_cd/webhook&#39;,
     }
 
-#    # manage service
+    # create the webhook config dir
-#    service { &#39;r10k-webhook&#39;:
+    file { $pt_r10k_webhook_dir:
-#      ensure    =&gt; &#39;running&#39;,
+      ensure   =&gt; directory,
-#      enable    =&gt; true,
+      owner    =&gt; &#39;root&#39;,
-#      subscribe =&gt; File[$pt_r10k_wh_config_file],
+      group    =&gt; &#39;root&#39;,
-#    }
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; etc_t,
+      seluser  =&gt; system_u,
+    }
+
+    # create webhook config
+    file { $pt_r10k_hook_config_file:
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0644&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; etc_t,
+      seluser  =&gt; system_u,
+      content  =&gt; template($pt_r10k_hook_config_erb),
+    }
+
+    # create service config
+    file { $pt_r10k_hook_config_file:
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0644&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; systemd_unit_file_t,
+      seluser  =&gt; system_u,
+      content  =&gt; template($pt_r10k_hook_service_erb),
+    }
+
+    # manage service
+    service { &#39;r10k-webhook&#39;:
+      ensure    =&gt; &#39;running&#39;,
+      enable    =&gt; true,
+      subscribe =&gt; File[$pt_r10k_hook_config_file],
+    }
   }
 }</pre>
       </td>