#49: Ensure conflicting web server is not running on remote

BR0kEN- · Jan 25, 2018 · 5889725 · 5889725
1 parent 7b8bd0c
commit 5889725
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/scripts/roles/cikit-php/tasks/nginx/local.yml b/scripts/roles/cikit-php/tasks/nginx/local.yml
@@ -1 +1,6 @@
 ---
+- name: Start FPM and add it to boot
+  service:
+    name: "php{{ php_version }}-fpm"
+    state: started
+    enabled: yes
diff --git a/scripts/roles/cikit-webserver/tasks/local.yml b/scripts/roles/cikit-webserver/tasks/local.yml
@@ -1,14 +1,3 @@
 ---
-- name: Eliminate web servers conflicts
-  service:
-    name: "{{ item }}"
-    # Stop conflicting web server.
-    state: stopped
-    # Prevent conflicting web server to be started on boot.
-    enabled: no
-  # Apply the rule for any web server, except currently selected.
-  when: web_server != item
-  with_items: "{{ cikit_webserver.servers }}"
-
 - include_role:
     name: "cikit-{{ web_server }}"
diff --git a/scripts/roles/cikit-webserver/tasks/main.yml b/scripts/roles/cikit-webserver/tasks/main.yml
@@ -3,4 +3,15 @@
   set_fact:
     web_server_operation_place: "{{ 'local' if localhost else 'remote' }}"
 
+- name: Eliminate web servers conflicts
+  service:
+    name: "{{ item }}"
+    # Stop conflicting web server.
+    state: stopped
+    # Prevent conflicting web server to be started on boot.
+    enabled: no
+  # Apply the rule for any web server, except currently selected.
+  when: web_server != item
+  with_items: "{{ cikit_webserver.servers }}"
+
 - include_tasks: "{{ web_server_operation_place }}.yml"
diff --git a/scripts/roles/cikit-webserver/tasks/remote.yml b/scripts/roles/cikit-webserver/tasks/remote.yml
@@ -6,3 +6,4 @@
 
 - include_role:
     name: cikit-apache2
+  when: "'apache2' == web_server"