.travis.yml

@@ -38,3 +38,9 @@ matrix:
       env: PUPPET_VERSION="~> 3.1.0"
 notifications:
   email: false
+  webhooks:
+    urls:
+      - 'https://webhooks.gitter.im/e/8936500cc6a369ff46ee' 
+    on_success: change
+    on_failure: always
+    on_start: false

CHANGELOG

@@ -1,3 +1,5 @@
+2.8.2 - Jerald Sheets 
+  * Troubleshooting RHEL 7 issues with systemd
 2.8.1 - See Commit History
   * Multiple Webhook updates for Centos 7 and Debian
 2.8.0 - Tom linkin

README.md

@@ -2,6 +2,7 @@
 [![Puppet Forge](http://img.shields.io/puppetforge/v/zack/r10k.svg)](https://forge.puppetlabs.com/zack/r10k)
 [![Github Tag](https://img.shields.io/github/tag/acidprime/r10k.svg)](https://github.com/acidprime/r10k)
 [![Build Status](https://travis-ci.org/acidprime/r10k.png?branch=master)](https://travis-ci.org/acidprime/r10k)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/acidprime/r10k?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 #### Table of Contents
 

manifests/params.pp

@@ -136,13 +136,13 @@
   # Service Settings for SystemD in EL7
   if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7' {
     $webhook_service_file     = '/usr/lib/systemd/system/webhook.service'
-    $webhook_service_template = 'webhook.service.erb'
+    $webhook_service_template = 'webhook.rehat.service.erb'
   } elsif $::osfamily == 'Gentoo' {
     $webhook_service_file     = '/etc/init.d/webhook'
     $webhook_service_template = 'webhook.init.gentoo.erb'
   } elsif $::osfamily == 'SUSE' and $::operatingsystemmajrelease >= '12' {
     $webhook_service_file     = '/etc/systemd/system/webhook.service'
-    $webhook_service_template = 'webhook.service.erb'
+    $webhook_service_template = 'webhook.suse.service.erb'
   } else {
     $webhook_service_file     = '/etc/init.d/webhook'
     $webhook_service_template = 'webhook.init.erb'

metadata.json

@@ -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.1",
+  "version": "2.8.2",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

templates/webhook.rehat.service.erb

@@ -0,0 +1,18 @@
+[Unit]
+Description=R10K Webhook Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=<%= @user %>
+TimeoutStartSec=90
+TimeoutStopSec=30
+
+ExecStart=/usr/local/bin/webhook
+
+KillMode=process
+
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target