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

Auto-merge for build 15

See merge request puppet/puppet_cd!13

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html

@@ -189,7 +189,16 @@
 91
 92
 93
-94</pre>
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span>
@@ -216,6 +225,15 @@ class puppet_cd::r10k::webhook (
       seluser  =&gt; system_u,
     }
 
+    # create the log file
+    file { &#39;/var/log/r10k-webhook.log&#39;:
+      ensure  =&gt; file,
+      owner   =&gt; &#39;puppet&#39;,
+      group   =&gt; &#39;puppet&#39;,
+      mode    =&gt; &#39;0644&#39;,
+      require =&gt; File[&#39;/opt/r10k-webhook&#39;],
+    }
+
     # create the requirements file
     file { $pt_r10k_req_file:
       ensure   =&gt; file,
@@ -227,7 +245,7 @@ class puppet_cd::r10k::webhook (
       seltype  =&gt; puppet_etc_t,
       seluser  =&gt; system_u,
       content  =&gt; template($pt_r10k_req_erb),
-      require  =&gt; File[&#39;/opt/r10k-webhook&#39;],
+      require  =&gt; File[&#39;/var/log/r10k-webhook.log&#39;],
     }
 
     # create the binary file

manifests/r10k/webhook.pp

@@ -25,6 +25,15 @@ class puppet_cd::r10k::webhook (
       seluser  => system_u,
     }
 
+    # create the log file
+    file { '/var/log/r10k-webhook.log':
+      ensure  => file,
+      owner   => 'puppet',
+      group   => 'puppet',
+      mode    => '0644',
+      require => File['/opt/r10k-webhook'],
+    }
+
     # create the requirements file
     file { $pt_r10k_req_file:
       ensure   => file,
@@ -36,7 +45,7 @@ class puppet_cd::r10k::webhook (
       seltype  => puppet_etc_t,
       seluser  => system_u,
       content  => template($pt_r10k_req_erb),
-      require  => File['/opt/r10k-webhook'],
+      require  => File['/var/log/r10k-webhook.log'],
     }
 
     # create the binary file