From 5011b26ec00cb90c75343e7ac6f49936aba750a2 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:32:38 -0500
Subject: [PATCH] Clean 4-server-options/tasks/main.yml

---
 roles/4-server-options/tasks/main.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index e0740cf93..0ce4d852e 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -8,29 +8,29 @@
 - name: Install named / BIND
   include_tasks: roles/network/tasks/named.yml
   when: named_install | bool
-  tags: base, named, network, domain
+  #tags: base, named, network, domain
 
 - name: Installing dhcpd
   include_tasks: roles/network/tasks/dhcpd.yml
   when: dhcpd_install | bool
-  tags: base, dhcpd, network, domain
+  #tags: base, dhcpd, network, domain
 
 - name: Install Squid (and DansGuardian if dansguardian_install)
   include_tasks: roles/network/tasks/squid.yml
   when: squid_install | bool
-  tags: base, squid, network, domain
+  #tags: base, squid, network, domain
 
 - name: Install Bluetooth - only on Raspberry Pi
   include_role:
     name: bluetooth
   when: (is_rpi and bluetooth_install) or bluetooth_installed is defined
-  tags: bluetooth
+  #tags: bluetooth
 
 - name: USB-LIB
   include_role:
     name: usb-lib
   when: usb_lib_install | bool
-  tags: usb-lib
+  #tags: usb-lib
 
 # NETWORK moved to the very end, after Stage 9 (9-LOCAL-ADDONS)
 # It can also be run manually using: cd /opt/iiab/iiab; ./iiab-network
@@ -46,25 +46,25 @@
   include_role:
     name: homepage
   # has no "when: XXXXX_install" flag
-  tags: base, homepage
+  #tags: base, homepage
 
 - name: POSTGRESQL
   include_role:
     name: postgresql
   when: postgresql_install | bool
-  tags: postgresql, pathagar, moodle
+  #tags: postgresql, pathagar, moodle
 
 - name: CUPS
   include_role:
     name: cups
   when: cups_install or cups_installed is defined
-  tags: cups
+  #tags: cups
 
 - name: SAMBA
   include_role:
     name: samba
   when: samba_install or samba_installed is defined
-  tags: samba
+  #tags: samba
 
 - name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation.  (This script was installed at the beginning of Stage 3 = roles/3-base-server/tasks/main.yml, which ran Apache playbook = roles/httpd/tasks/main.yml)
   command: /usr/bin/iiab-refresh-wiki-docs
@@ -75,4 +75,3 @@
     dest: "{{ iiab_env_file }}"
     regexp: '^STAGE=*'
     line: 'STAGE=4'
-    state: present