From 54dd1ef3c0ccbaccdfb966bf2eacdde008dc0d6f Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Tue, 3 Oct 2017 17:38:06 +0200 Subject: [PATCH] Remove legacy code --- tasks/prepare.yml | 15 --------------- tests/test.yml | 3 +-- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/tasks/prepare.yml b/tasks/prepare.yml index a5f5132..621a5f8 100644 --- a/tasks/prepare.yml +++ b/tasks/prepare.yml @@ -1,20 +1,5 @@ --- -- name: SET_FACT | Backward compatibility (nginx_vhosts) - set_fact: - nginx_sites: "{{ nginx_vhosts }}" - when: nginx_vhosts is defined - -- name: SET_FACT | Backward compatibility (nginx_default_vhost_ssl) - set_fact: - nginx_default_site_ssl: "{{ nginx_default_vhost_ssl }}" - when: nginx_default_vhost_ssl is defined - -- name: SET_FACT | Backward compatibility (nginx_default_vhost) - set_fact: - nginx_default_site: "{{ nginx_default_vhost }}" - when: nginx_default_vhost is defined - - name: SHELL | Get Nginx version shell: nginx -v 2>&1 | sed -r 's#.*/##;' | cut -d ' ' -f 1 args: diff --git a/tests/test.yml b/tests/test.yml index b19bcc4..4a5269c 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -118,8 +118,7 @@ - '}' nginx_default_site: 'first-test' nginx_default_site_ssl: 'test-ssl-predeployed.local' -# TODO: nginx_vhosts -> nginx_sites (for now check backward compatibility) - nginx_vhosts: + nginx_sites: - name: - 'test.local' - 'test-alias.local'