Fixed init issues

ansible-community · Mar 30, 2017 · 89ddb69 · 89ddb69
1 parent ca93961
commit 89ddb69
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -178,3 +178,7 @@
 ## v1.3.10
 
 - Fix other modes / types ノ( ゜-゜ノ)
+
+## v1.3.11
+
+- Update init scripts
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -75,26 +75,26 @@
     dest: /etc/init.d/vault
     owner: root
     group: root
-    mode: "0755"
-  when: not ansible_distribution == "Debian"
+    mode: 0755
+  when: not ansible_service_mgr == "systemd" and not ansible_os_family == "Debian" and not ansible_os_family == "FreeBSD" and not ansible_os_family == "Solaris"
 
 - name: Debian init script
   template:
     src: vault_debian.init.j2
     dest: /etc/init.d/vault
     owner: root
     group: root
-    mode: "0755"
-  when: ansible_distribution == "Debian" and ansible_distribution_major_version|int <= 7
+    mode: 0755
+  when: not ansible_service_mgr == "systemd" and ansible_os_family == "Debian" and not ansible_os_family == "FreeBSD" and not ansible_os_family == "Solaris"
 
-- name: systemd unit
+- name: systemd script
   template:
     src: vault_systemd.service.j2
     dest: /lib/systemd/system/vault.service
     owner: root
     group: root
-    mode: "0644"
-  when: ansible_distribution_major_version|int >= 7
+    mode: 0644
+  when: ansible_service_mgr == "systemd" and not ansible_os_family == "FreeBSD" and not ansible_os_family == "Solaris"
 
 - name: Start Vault
   service:

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.3.10
+v1.3.11