meta role cleanup - demo

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

@@ -23,28 +23,18 @@
   when: squid_install | bool
   tags: base, squid, network, domain
 
-# until porting is complete
-- name: Install python
-  package: 
-    name: python
-    state: present
-
-- name: Create a Python interface to iiab.env
-  template:
-    src: roles/1-prep/templates/iiab_env.py.j2
-    dest: /etc/iiab/iiab_env.py
-
-- name: Installing captive portal
-  include_tasks: roles/captive-portal/tasks/main.yml
-  when: captive_portal_install | bool
-  tags: base, captive-portal, network, domain
-
 - name: Install Bluetooth - only on Raspberry Pi
   include_role:
     name: bluetooth
   when: is_rpi and bluetooth_install
   tags: bluetooth
 
+- name: USB-LIB
+  include_role:
+    name: usb-lib
+  when: usb_lib_install | bool
+  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
 #
@@ -68,11 +58,11 @@
   tags: postgresql, pathagar, moodle
 
 # UNMAINTAINED
-- name: AUTHSERVER
+#- name: AUTHSERVER
-  include_role:
+#  include_role:
-    name: authserver
+#    name: authserver
-  when: authserver_install is defined and authserver_install
+#  when: authserver_install is defined and authserver_install
-  tags: olpc, authserver
+#  tags: olpc, authserver
 
 - name: CUPS
   include_role:
@@ -86,12 +76,6 @@
   when: samba_install | bool
   tags: samba
 
-- name: USB-LIB
-  include_role:
-    name: usb-lib
-  when: usb_lib_install | bool
-  tags: usb-lib
-
 - 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
   when: internet_available and not nodocs

roles/6-generic-apps/tasks/main.yml

@@ -21,11 +21,12 @@
   when: mediawiki_install | bool
   tags: mediawiki
 
-- name: EJABBERD
+# unmaintained
-  include_role:
+#- name: EJABBERD
-    name: ejabberd
+#  include_role:
-  when: ejabberd_install | bool
+#    name: ejabberd
-  tags: ejabberd
+#  when: ejabberd_install | bool
+#  tags: ejabberd
 
 - name: ELGG
   include_role:

roles/7-edu-apps/tasks/main.yml

@@ -34,18 +34,18 @@
   tags: osm, maps
 
 # UNMAINTAINED
-- name: OSM
+#- name: OSM
-  include_role:
+#  include_role:
-    name: osm
+#    name: osm
-  when: osm_install is defined and osm_install
+#  when: osm_install is defined and osm_install
-  tags: osm, maps
+#  tags: osm, maps
 
 # UNMAINTAINED
-- name: PATHAGAR
+#- name: PATHAGAR
-  include_role:
+#  include_role:
-    name: pathagar
+#    name: pathagar
-  when: pathagar_install is defined and pathagar_install
+#  when: pathagar_install is defined and pathagar_install
-  tags: pathagar
+#  tags: pathagar
 
 - name: SUGARIZER
   include_role:

roles/8-mgmt-tools/tasks/main.yml

@@ -34,18 +34,18 @@
   tags: phpmyadmin
 
 # UNMAINTAINED
-- name: SUGAR-STATS
+#- name: SUGAR-STATS
-  include_role:
+#  include_role:
-    name: sugar-stats
+#    name: sugar-stats
-  when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS"
+#  when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS"
-  tags: olpc, sugar-stats
+#  tags: olpc, sugar-stats
 
 # UNMAINTAINED
-- name: TEAMVIEWER
+#- name: TEAMVIEWER
-  include_role:
+#  include_role:
-    name: teamviewer
+#    name: teamviewer
-  when: teamviewer_install is defined and teamviewer_install
+#  when: teamviewer_install is defined and teamviewer_install
-  tags: teamviewer
+#  tags: teamviewer
 
 - name: VNSTAT
   include_role:
@@ -54,11 +54,11 @@
   tags: vnstat
 
 # UNMAINTAINED
-- name: XOVIS
+#- name: XOVIS
-  include_role:
+#  include_role:
-    name: xovis
+#    name: xovis
-  when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS"
+#  when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS"
-  tags: xovis
+#  tags: xovis
 
 - name: Recording STAGE 8 HAS COMPLETED ======================
   lineinfile:

roles/9-local-addons/tasks/main.yml

@@ -9,6 +9,23 @@
   when: internetarchive_install | bool
   tags: internetarchive
 
+# until porting is complete
+- name: Install python-2.7
+  package:
+    name: python
+    state: present
+
+# used by iiab-update-map supplied by osm-vector-maps
+- name: Create a Python interface to iiab.env
+  template:
+    src: roles/1-prep/templates/iiab_env.py.j2
+    dest: /etc/iiab/iiab_env.py
+
+- name: Installing captive portal
+  include_tasks: roles/captive-portal/tasks/main.yml
+  when: captive_portal_install | bool
+  tags: base, captive-portal, network, domain
+
 - name: MINETEST
   include_role:
     name: minetest