From 50f72834df59355bcfba7cf1d8853f6892f5ff19 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:43:45 -0500
Subject: [PATCH] Clean 6-generic-apps/tasks/main.yml

---
 roles/6-generic-apps/tasks/main.yml | 41 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml
index c6edbf859..f77eba547 100644
--- a/roles/6-generic-apps/tasks/main.yml
+++ b/roles/6-generic-apps/tasks/main.yml
@@ -6,75 +6,78 @@
 - name: AZURACAST
   include_role:
     name: azuracast
-  tags: azuracast
+  when: azuracast_install | bool
+  #tags: azuracast
 
 - name: DOKUWIKI
   include_role:
     name: dokuwiki
-  tags: dokuwiki
+  when: dokuwiki_install | bool
+  #tags: dokuwiki
 
 - name: MEDIAWIKI
   include_role:
     name: mediawiki
-  tags: mediawiki
+  when: mediawiki_install | bool
+  #tags: mediawiki
 
 # UNMAINTAINED
 - name: EJABBERD
   include_role:
     name: ejabberd
   when: ejabberd_install | bool
-  tags: ejabberd
+  #tags: ejabberd
 
 - name: ELGG
   include_role:
     name: elgg
-  tags: elgg
+  when: elgg_install | bool
+  #tags: elgg
 
 - name: GITEA
   include_role:
     name: gitea
-  tags: gitea
+  when: gitea_install | bool
+  #tags: gitea
 
 - name: LOKOLE
   include_role:
     name: lokole
-  tags: lokole
+  when: lokole_install | bool
+  #tags: lokole
 
 - name: MOSQUITTO
   include_role:
     name: mosquitto
-  tags: mosquitto
+  when: mosquitto_install | bool
+  #tags: mosquitto
 
 - name: NODE-RED
   include_role:
     name: nodered
-  tags: nodered
+  when: nodered_install | bool
+  #tags: nodered
 
 - name: NEXTCLOUD
   include_role:
     name: nextcloud
-  tags: nextcloud
-
-#- name: OWNCLOUD
-#  include_role:
-#    name: owncloud
-#  when: owncloud_install | bool
-#  tags: owncloud
+  when: nextcloud_install | bool
+  #tags: nextcloud
 
 - name: PBX
   include_role:
     name: pbx
   when: pbx_install | bool
-  tags: pbx  
+  #tags: pbx  
 
 - name: WORDPRESS
   include_role:
     name: wordpress
-  tags: wordpress
+  when: wordpress_install | bool
+  #tags: wordpress
 
 - name: Recording STAGE 6 HAS COMPLETED ====================
   lineinfile:
     dest: "{{ iiab_env_file }}"
     regexp: '^STAGE=*'
     line: 'STAGE=6'
-    state: present