Enable (#2)

* Variable to disable service * when fix * travis
Eyepea · Feb 16, 2018 · 25be4e0 · 25be4e0
1 parent 23caf9a
commit 25be4e0
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 15 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,5 +2,6 @@
 
 ah_version: master
 ah_requirements_path: requirements.txt
+ah_enabled: True
 ah_sockets:
   - 0.0.0.0:8000
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -3,13 +3,15 @@
 - name: Restart socket
   systemd:
     name: "{{ ah_name }}.socket"
-    daemon-reload: True
     state: restarted
-  when: "'travis' not in group_names"
+  when:
+    - "'travis' not in group_names"
+    - "{{ ah_enabled }}"
 
 - name: Restart service
   systemd:
     name: "{{ ah_name }}.service"
-    daemon-reload: True
     state: restarted
-  when: "'travis' not in group_names"
+  when:
+    - "'travis' not in group_names"
+    - "{{ ah_enabled }}"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -51,30 +51,59 @@
     src: "{{ ah_systemd_socket_template | default('etc/systemd/system/project.socket.j2') }}"
     dest: "/etc/systemd/system/{{ ah_name }}.socket"
     force: yes
+  register: ah_socket_config
   notify:
     - Restart socket
 
-- name: Enable systemd socket
-  tags:
-    - travis-exempt
-  systemd:
-    daemon_reload: yes
-    name: "{{ ah_name }}.socket"
-    enabled: True
-    masked: False
-
 - name: Configure systemd service
   template:
     src: "{{ ah_systemd_service_template | default('etc/systemd/system/project.service.j2') }}"
     dest: "/etc/systemd/system/{{ ah_name }}.service"
     force: yes
+  register: ah_service_config
   notify:
     - Restart service
 
-- name: Enable systemd service
+- name: Systemd daemon-reload
+  tags:
+    - travis-exempt
+  systemd:
+    daemon-reload: yes
+  when:
+    - "ah_service_config.changed or ah_socket_config.changed"
+
+- name: "Enable {{ ah_enabled }} systemd socket"
+  tags:
+    - travis-exempt
+  systemd:
+    name: "{{ ah_name }}.socket"
+    enabled: "{{ ah_enabled }}"
+    masked: False
+
+- name: "Enable {{ ah_enabled }} systemd service"
+  tags:
+    - travis-exempt
+  systemd:
+    name: "{{ ah_name }}.service"
+    enabled: "{{ ah_enabled }}"
+    masked: False
+
+- name: Start systemd socket
+  tags:
+    - travis-exempt
+  systemd:
+    name: "{{ ah_name }}.socket"
+    masked: False
+    state: started
+  when:
+    - ah_enabled
+
+- name: Start systemd service
   tags:
     - travis-exempt
   systemd:
     name: "{{ ah_name }}.service"
-    enabled: True
     masked: False
+    state: started
+  when:
+    - ah_enabled