Remove default vhost removal, since this is now implemented with wcm-…

…io-devops/ansible-role-apache#3
wcm-io-devops · Jul 13, 2018 · 6432600 · 6432600
1 parent ec51c86
commit 6432600
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -30,6 +30,7 @@ dependencies:
   - {
       role: geerlingguy.apache,
       apache_remove_default_vhost: true,
+      apache_remove_default_vhost_ssl: true,
       apache_create_vhosts: false,
       apache_listen_port: "{{ aem_dispatcher_port }}",
       apache_listen_port_ssl: "{{ aem_dispatcher_port_ssl }}"

diff --git a/tasks/setup_RedHat.yml b/tasks/setup_RedHat.yml
@@ -1,16 +1,3 @@
-# This should be done by the apache role as well
-# Remove once https://github.com/geerlingguy/ansible-role-apache/issues/81 is resolved
-- name: Remove default vhosts.
-  file:
-    path: "{{ apache_conf_path }}/vhosts.conf"
-    state: absent
-  with_items:
-    - vhosts.conf
-    - userdir.conf
-    - welcome.conf
-  notify: restart apache
-  when: apache_remove_default_vhost
-
 - name: Enable dispatcher module.
   copy:
     dest: "{{ apache_server_root }}/conf.modules.d/01-dispatcher.conf"