Merge branch 'devel'

brianshumate · brianshumate · commit cbd5ab659c0c · 2017-02-23T12:17:31.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -132,3 +132,8 @@
 - Fixed typo in install tasks fixes #6 (thanks @asemt)
 - Added nomad_group_name and use nomad_iface (thanks @dggreenbaum)
 - Updated documentation
+
+## v1.4.5
+
+- Switch init scripts to send SIGTERM to address #2
+- Add leave_on_terminate and set to True by default
diff --git a/templates/base.hcl.j2 b/templates/base.hcl.j2
@@ -33,3 +33,6 @@ advertise {
 
 # Enable debug endpoints
 enable_debug = true
+
+# Graceful leave on SIGTERM
+leave_on_terminate = true
diff --git a/templates/nomad_sysvinit.j2 b/templates/nomad_sysvinit.j2
@@ -51,7 +51,7 @@ stop() {
         fi
 
         mkpidfile
-        killproc $KILLPROC_OPT $nomad -9
+        killproc $KILLPROC_OPT $nomad -SIGTERM
 
         retcode=$?
         rm -f /var/lock/subsys/nomad $PID_FILE
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.4.4
+v1.4.5
