Merge branch 'devel'

Author: brianshumate

CHANGELOG.md

@@ -137,3 +137,7 @@
 
 - Switch init scripts to send SIGTERM to address #2
 - Add leave_on_terminate and set to True by default
+
+## v1.4.6
+
+- Better conditionals for init scripts fixes #5

tasks/main.yml

@@ -66,15 +66,15 @@
 
 - name: SYSV init script
   template: src=nomad_sysvinit.j2 dest=/etc/init.d/nomad owner=root group=root mode=755
-  when: not ansible_distribution == "Debian"
+  when: not ansible_service_mgr == "systemd" and not ansible_os_family == "Debian"
 
 - name: Debian init script
   template: src=nomad_debian.init.j2 dest=/etc/init.d/nomad owner=root group=root mode=755
-  when: ansible_distribution == "Debian" and ansible_distribution_major_version|int <= 7
+  when: not ansible_service_mgr == "systemd" and ansible_os_family == "Debian"
 
 - name: systemd script
   template: src=nomad_systemd.service.j2 dest=/lib/systemd/system/nomad.service owner=root group=root mode=644
-  when: ansible_distribution_major_version|int >= 7
+  when: ansible_service_mgr == "systemd"
 
 - name: Start Nomad
   service: name=nomad state=started

version.txt

@@ -1 +1 @@
-v1.4.5
+v1.4.6