Recommit for updates in build 17

doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html

@@ -166,9 +166,9 @@ class puppet_cd::firewall::iptables (
       jump  => 'accept',
     }
     if $pt_use_r10k_webhook == true {
-      firewall { '38080 open port 8080':
+      firewall { '38088 open port 8088':
         proto => 'tcp',
-        dport => '8080',
+        dport => '8088',
         jump  => 'accept',
       }
     }

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html

@@ -128,10 +128,10 @@ class puppet_cd::main::config (
     include puppet_cd::puppetdb::service
   }
 
-#  if $pt_use_r10k == true {
+  if $pt_use_r10k == true {
-#    include puppet_cd::r10k::install
+    include puppet_cd::r10k::install
-#    include puppet_cd::r10k::webhook
+    include puppet_cd::r10k::webhook
-#  }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -1803,7 +1803,7 @@ class puppet_cd::params (
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
 ## r10k
   $pt_r10k_dir                      = "${pt_main_dir}/r10k"
-  $pt_r10k_webhook_dir              = '/opt/r10k-webhook'
+  $pt_r10k_webhook_dir              = '/etc/r10k-webhook'
 
 # files
 ## puppet
@@ -1836,8 +1836,8 @@ class puppet_cd::params (
   $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
   $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
   $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
-  $pt_r10k_wh_service_file          = '/etc/systemd/system/r10k-webhook.service'
+  $pt_r10k_wh_config_file           =  "${pt_r10k_webhook_dir}/config.json"
-  $pt_r10k_wh_service_erb           = 'puppet_cd/r10k/r10k_webhook_service.erb'
+  $pt_r10k_wh_config_erb            = 'puppet_cd/r10k/r10k_webhook_config.erb'
 
 # service
   $pt_server_service                = 'puppetserver'

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html

@@ -173,32 +173,7 @@
 75
 76
 77
-78
+78</pre>
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-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>
@@ -213,27 +188,17 @@ class puppet_cd::r10k::webhook (
     }
 
     # create the webhook dir
-    file { &#39;/opt/r10k-webhook&#39;:
+    file { $pt_r10k_webhook_dir:
       ensure   =&gt; directory,
-      path     =&gt; $pt_r10k_webhook_dir,
+      owner    =&gt; &#39;root&#39;,
-      owner    =&gt; &#39;puppet&#39;,
+      group    =&gt; &#39;root&#39;,
-      group    =&gt; &#39;puppet&#39;,
       mode     =&gt; &#39;0755&#39;,
       selrange =&gt; s0,
       selrole  =&gt; object_r,
-      seltype  =&gt; puppet_etc_t,
+      seltype  =&gt; etc_t,
       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,
@@ -242,26 +207,26 @@ class puppet_cd::r10k::webhook (
       mode     =&gt; &#39;0644&#39;,
       selrange =&gt; s0,
       selrole  =&gt; object_r,
-      seltype  =&gt; puppet_etc_t,
+      seltype  =&gt; etc_t,
       seluser  =&gt; system_u,
       content  =&gt; template($pt_r10k_req_erb),
-      require  =&gt; File[&#39;/var/log/r10k-webhook.log&#39;],
     }
 
-    # create the binary file
+    # create the webhook config file
-    file { $pt_r10k_webhook_file:
+    file { $pt_r10k_wh_config_file:
       ensure   =&gt; file,
-      owner    =&gt; &#39;puppet&#39;,
+      owner    =&gt; &#39;root&#39;,
-      group    =&gt; &#39;puppet&#39;,
+      group    =&gt; &#39;root&#39;,
       mode     =&gt; &#39;0644&#39;,
       selrange =&gt; s0,
       selrole  =&gt; object_r,
-      seltype  =&gt; puppet_etc_t,
+      seltype  =&gt; etc_t,
       seluser  =&gt; system_u,
-      content  =&gt; template($pt_r10k_webhook_erb),
+      content  =&gt; template($pt_r10k_wh_config_erb),
-      require  =&gt; File[&#39;/opt/r10k-webhook&#39;],
+      require  =&gt; File[$pt_r10k_webhook_dir],
     }
 
+
     # install pip dependencies
     exec { &#39;pip_install_r10k_webhook&#39;:
       command =&gt; &#39;pip3 install --user -r /opt/r10k-webhook/requirements.txt&#39;,
@@ -278,26 +243,11 @@ class puppet_cd::r10k::webhook (
       refreshonly =&gt; true,
     }
 
-    # install systemd service file
-    file { $pt_r10k_wh_service_file:
-      ensure   =&gt; 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_wh_service_erb),
-      notify   =&gt; Exec[&#39;systemctl_daemon_reload&#39;],
-    }
-
     # manage service
     service { &#39;r10k-webhook&#39;:
       ensure    =&gt; &#39;running&#39;,
       enable    =&gt; true,
-      require   =&gt; File[$pt_r10k_wh_service_file],
+      subscribe =&gt; File[$pt_r10k_wh_config_file],
-      subscribe =&gt; File[$pt_r10k_webhook_file],
     }
   }
 }</pre>