Update main.yml

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

@@ -3,22 +3,29 @@
 - name: ...IS BEGINNING ============================================]
   command: echo
 
-- name: HOMEPAGE
-  include_role:
-    name: homepage
-  tags: base, homepage
-
 - name: SSHD
   include_role:
     name: sshd
+  # has no "when: XXXXX_install" flag
   tags: base, sshd
 
+- name: OPENVPN
+  include_role:
+    name: openvpn
+  when: openvpn_install
+  tags: openvpn
+
 - name: NETWORK
   include_role:
     name: network
+  # has no "when: XXXXX_install" flag
   tags: base, network
 
-# the above 3 have no "when: XXXXX_install" flag -- whereas the 5 below do
+- name: HOMEPAGE
+  include_role:
+    name: homepage
+  # has no "when: XXXXX_install" flag
+  tags: base, homepage
 
 - name: AUTHSERVER
   include_role:
@@ -26,11 +33,11 @@
   when: authserver_install
   tags: authserver
 
-- name: OPENVPN
+- name: CUPS
   include_role:
-    name: openvpn
+    name: cups
-  when: openvpn_install
+  when: cups_install
-  tags: openvpn
+  tags: cups
 
 - name: SAMBA
   include_role:
@@ -44,12 +51,6 @@
   when: usb_lib_install
   tags: usb-lib
 
-- name: CUPS
-  include_role:
-    name: cups
-  when: cups_install
-  tags: cups
-
 # this script can be sourced to get iiab location
 - name: Create iiab.env file
   template: src=roles/1-prep/templates/iiab.env.j2