Merge pull request RiANOl#1 from Karen09/master

Changing systemd CentOS7 init script
moonape1226 · Mar 30, 2016 · 10c3179 · 10c3179
2 parents 68a6d70 + df14173
commit 10c3179
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -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