From 1a6dfbef21adf0e4628dd5a5e45d7f5fc817ddfb Mon Sep 17 00:00:00 2001 From: Tommaso Date: Mon, 8 Oct 2018 21:07:18 +0200 Subject: [PATCH 1/2] Add task to remove `default.conf` from sites-enabled/ --- tasks/remove-defaults.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tasks/remove-defaults.yml b/tasks/remove-defaults.yml index 860e2c4..e7d8e0e 100644 --- a/tasks/remove-defaults.yml +++ b/tasks/remove-defaults.yml @@ -6,6 +6,13 @@ notify: - reload nginx +- name: Disable the default site (on newer nginx versions) + file: + path: "{{nginx_conf_dir}}/sites-enabled/default.conf" + state: absent + notify: + - reload nginx + - name: Remove the default configuration file: path: "{{nginx_conf_dir}}/conf.d/default.conf" From 07dc28a203345c4e27f6484d7dcd412215a145f4 Mon Sep 17 00:00:00 2001 From: Tommaso Date: Wed, 10 Oct 2018 22:11:02 +0200 Subject: [PATCH 2/2] Check if `default` site is not inside user config --- tasks/remove-defaults.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/remove-defaults.yml b/tasks/remove-defaults.yml index e7d8e0e..28b29a4 100644 --- a/tasks/remove-defaults.yml +++ b/tasks/remove-defaults.yml @@ -12,6 +12,8 @@ state: absent notify: - reload nginx + when: > + 'default' not in nginx_sites.keys() - name: Remove the default configuration file: