From df14173ff513748d596351895a6140ebc8987640 Mon Sep 17 00:00:00 2001
From: karen09 <kazein09@gmail.com>
Date: Fri, 18 Mar 2016 14:42:00 +0100
Subject: [PATCH] Changing systemd CentOS7 init script

---
 manifests/config.pp         |  6 ++++++
 templates/nomad.systemd.erb | 18 ++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index ad97af8..e23b113 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -34,6 +34,12 @@
         }
       }
       'systemd' : {
+        file { '/etc/sysconfig/nomad':
+          ensure  => directory,
+          mode    => '0644',
+          owner   => 'root',
+          group   => 'root',
+        }->
         file { '/lib/systemd/system/nomad.service':
           mode    => '0644',
           owner   => 'root',
diff --git a/templates/nomad.systemd.erb b/templates/nomad.systemd.erb
index e6a4ee3..139d1d7 100644
--- a/templates/nomad.systemd.erb
+++ b/templates/nomad.systemd.erb
@@ -1,18 +1,16 @@
 [Unit]
-Description=Nomad Agent
-Wants=basic.target
-After=basic.target network.target
+Description=Nomad agent
+Requires=network-online.target
+After=network-online.target
 
 [Service]
-User=<%= scope.lookupvar('nomad::user') %>
-Group=<%= scope.lookupvar('nomad::group') %>
-ExecStart=<%= scope.lookupvar('nomad::bin_dir') %>/nomad agent \
-  -config <%= scope.lookupvar('nomad::config_dir') %> <%= scope.lookupvar('nomad::extra_options') %>
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
+EnvironmentFile=-/etc/sysconfig/nomad
 Restart=on-failure
+ExecStart=<%= scope.lookupvar('nomad::bin_dir') %>/nomad agent -config=<%= scope.lookupvar('nomad::config_dir') %> <%= scope.lookupvar('nomad::extra_options') %>
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
 RestartSec=42s
 LimitNOFILE=131072
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file