From 88cdaece388027e50922e4c50aa18f4ac673a0a9 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@debianiste.org>
Date: Fri, 31 Jul 2015 01:02:37 +0200
Subject: [PATCH] Fix idempotent: vhost disabled/deleted

---
 tasks/vhost.yml | 8 ++++++--
 tests/test.yml  | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tasks/vhost.yml b/tasks/vhost.yml
index 14531e0..b9d5b9b 100644
--- a/tasks/vhost.yml
+++ b/tasks/vhost.yml
@@ -17,6 +17,7 @@
     dest=/etc/nginx/sites-available/{{ item.name[0] }}
   with_items: nginx_vhosts
   notify: reload nginx
+  when: item.delete is not defined or not item.delete
 
 #- name: COPY | Add index.html / index.php
 #  copy: src={{ item }} dest={{ nginx_root }}/{{ item.name }}/public/{{ item }} owner=www-data group=www-data mode=0666
@@ -36,13 +37,16 @@
     state=link
   with_items: nginx_vhosts
   notify: reload nginx
-  when: item.enabled is not defined or (item.enabled is defined and item.enabled)
+  when: >
+    ((item.enable is not defined) or
+    (item.enable is defined and item.enable)) and
+    (item.delete is not defined or not item.delete)
 
 - name: FILE | Disable vhosts
   file: dest=/etc/nginx/sites-enabled/{{ item.name[0] }} state=absent
   with_items: nginx_vhosts
   notify: reload nginx
-  when: item.enabled is defined and not item.enabled
+  when: item.enable is defined and not item.enable
 
 #- name: FILE | Create ssl dir per vhost (if needed)
 #  file: dest=/etc/nginx/ssl/{{ item.name }} owner=root mode=0750 state=directory
diff --git a/tests/test.yml b/tests/test.yml
index 7f561ad..b36f69e 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -29,6 +29,10 @@
         redirect_from:
           - 'www.test-php.local'
         template: '_php'
+      - name:
+          - 'deleted.local'
+        template: '_base'
+        delete: true
   roles:
     - ../../
   post_tasks: