Update 4-server-options/tasks/main.yml

roles/4-server-options/tasks/main.yml

@@ -8,47 +8,41 @@
 - name: Install named / BIND
   include_tasks: roles/network/tasks/named.yml
   when: named_install | bool
-  #tags: base, named, network, domain
 
 - name: Installing dhcpd
   include_tasks: roles/network/tasks/dhcpd.yml
   when: dhcpd_install | bool
-  #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
 
 - name: Install Bluetooth - only on Raspberry Pi
   include_role:
     name: bluetooth
-  when: (is_rpi and bluetooth_install) or bluetooth_installed is defined
-  #tags: bluetooth
+  when: is_rpi and bluetooth_install    # or bluetooth_installed is defined
 
 - name: USB-LIB
   include_role:
     name: usb-lib
   when: usb_lib_install | bool
-  #tags: usb-lib
 
+# This is in Stage 4-SERVER-OPTIONS (rather than 3-BASE-SERVER) because var
+# iiab_home_url changes, and may need to be re-run in the field/offline/etc.
 - name: HOMEPAGE
   include_role:
     name: homepage
   # has no "when: XXXXX_install" flag
-  #tags: base, homepage
 
 - name: CUPS
   include_role:
     name: cups
-  when: cups_install or cups_installed is defined
-  #tags: cups
+  when: cups_install    # or cups_installed is defined
 
 - name: SAMBA
   include_role:
     name: samba
-  when: samba_install or samba_installed is defined
-  #tags: samba
+  when: samba_install    # or samba_installed is defined
 
 - 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