Merge pull request #77 from Jonnymcc/fix-remove-defaults

Allow the default site to be removed with hash merge behavior
jdauphant · Nov 18, 2015 · 1797a09 · 1797a09
2 parents 192e113 + f44ae35
commit 1797a09
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tasks/configuration.yml b/tasks/configuration.yml
@@ -25,14 +25,14 @@
 
 - name: Create the configurations for sites
   template: src=site.conf.j2 dest={{nginx_conf_dir}}/sites-available/{{ item }}.conf
-  with_items: nginx_sites.keys()
+  with_items: nginx_sites.keys() | difference(nginx_remove_sites)
   notify:
    - restart nginx
   tags: [configuration,nginx]
 
 - name: Create links for sites-enabled
   file: state=link src={{nginx_conf_dir}}/sites-available/{{ item }}.conf dest={{nginx_conf_dir}}/sites-enabled/{{ item }}.conf
-  with_items: nginx_sites.keys()
+  with_items: nginx_sites.keys() | difference(nginx_remove_sites)
   notify:
    - reload nginx
   tags: [configuration,nginx]