diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index ce1c43212..83a06d30a 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -8,12 +8,6 @@ name: mysql when: mysql_install | bool -- name: WWW_BASE (WWW_OPTIONS should be installed later) - include_role: - name: www_base - #when: www_base_install | bool - #when: apache_install or nginx_install - - name: HTTPD (Apache) include_role: name: httpd @@ -24,6 +18,12 @@ name: nginx when: nginx_install | bool +- name: WWW_BASE (WWW_OPTIONS should be installed later) + include_role: + name: www_base + #when: www_base_install | bool + #when: apache_install or nginx_install + - name: dnsmasq (install now, configure LATER in 'network', after Stage 9) include_tasks: roles/network/tasks/dnsmasq.yml when: dnsmasq_install | bool