Showing with 8 additions and 3 deletions.
  1. +2 −0 CHANGELOG
  2. +1 −1 manifests/webhook.pp
  3. +1 −1 metadata.json
  4. +4 −1 templates/webhook.rehat.service.erb
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.8.2 - Jordan Olshevski
* Fix for RHEL 7 webhook
2.8.2 - Jerald Sheets
* Troubleshooting RHEL 7 issues with systemd
2.8.1 - See Commit History
Expand Down
2 changes: 1 addition & 1 deletion manifests/webhook.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}

if $manage_packages {
include webhook::package
include r10k::webhook::package
}

if $::is_pe == true or $::is_pe == 'true' {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"source": "https://github.com/acidprime/r10k",
"summary": "Module for setting up dynamic environments using r10k",
"tags": ["git", "pe", "environment", "mcollective"],
"version": "2.8.2",
"version": "2.8.3",
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
Expand Down
5 changes: 4 additions & 1 deletion templates/webhook.rehat.service.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ Description=R10K Webhook Service
After=syslog.target network.target

[Service]
Type=simple
Type=forking
EnvironmentFile=-/etc/sysconfig/webhook
User=<%= @user %>
PIDFile=/var/run/webhook/webhook.pid
TimeoutStartSec=90
TimeoutStopSec=30
RestartSec=10000

ExecStart=/usr/local/bin/webhook

Expand Down