From bd1e9eb8bf08d50e666004addca8126e6b2928b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:26:58 -0400 Subject: [PATCH 01/32] Update debs.yml --- roles/calibre/tasks/debs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 797b2bb57..60e74d85e 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -28,8 +28,9 @@ # when: is_rpi and internet_available - name: Upgrade to latest Calibre using .deb's from testing (rpi) - #command: scripts/calibre-install-latest-rpi-plus.sh # NEC FOR Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh - command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x + #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh + #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x + command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only way that was not attempted: sid-like calibre-install-unstable.sh). THO NOT BOOTABLE IN Zero W (#952) when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) From 4ff2589dbf92466e2880bd4fc0b36e12df99715e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:40:59 -0400 Subject: [PATCH 02/32] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index c8bf11ebd..cf921cfcc 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -1,9 +1,18 @@ #!/bin/bash +# Calibre 3.29 requires this approach, to overcome error: +# +# calibre-bin : Depends: qtbase-abi-5-10-0 but it is not installable +# E: Unable to correct problems, you have held broken packages. +# +# Above error proved insurmountable when trying most all scripts in /opt/iiab/iiab/scripts -- even those that DID solve this error: +# +# calibre : Depends: python-pyqt5 (>= 5.11.2+dfsg-1+b1) + # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # breakthrough possible! # -# SEE COMMENTS AT THE TOP OF scripts/calibre-install-packages.sh +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below From 3cd03d83a1560e78f260e7d3e4c7d4165201ac2d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:43:30 -0400 Subject: [PATCH 03/32] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index 333985103..ab510bc5d 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -11,6 +11,7 @@ # http://archive.raspbian.org/raspbian/pool/main/c/calibre/ # # Might break future updates; you have been warned. +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from unstable From aad9b2e4f5a715919fa698349cfdea9eabdce93e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:43:49 -0400 Subject: [PATCH 04/32] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 869a4b64f..607592bbb 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -3,7 +3,8 @@ # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # breakthrough possible! # -# SEE COMMENTS AT THE TOP OF scripts/calibre-install-packages.sh +# Might break future updates; you have been warned. +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from raspbian testing From 06a384d2127e8d3e8742915f1ac586e73e8c47d0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:44:13 -0400 Subject: [PATCH 05/32] Update calibre-install-latest-rpi-plus.sh --- scripts/calibre-install-latest-rpi-plus.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest-rpi-plus.sh b/scripts/calibre-install-latest-rpi-plus.sh index cf9d5114c..7237f2b2b 100755 --- a/scripts/calibre-install-latest-rpi-plus.sh +++ b/scripts/calibre-install-latest-rpi-plus.sh @@ -12,7 +12,8 @@ # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # breakthrough possible! # -# SEE COMMENTS AT THE TOP OF scripts/calibre-install-packages.sh +# Might break future updates; you have been warned. +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive From bae8051ec7c63a56c5e33a5e66b26e040b9b27f8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:45:16 -0400 Subject: [PATCH 06/32] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index cf921cfcc..363866335 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -12,6 +12,7 @@ # Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical # breakthrough possible! # +# Might break future updates; you have been warned. # SEE NOTES AT TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive From 20e499bc4bed4fc23df676c7d2bacb6edf8817a0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:55:36 -0400 Subject: [PATCH 07/32] Update debs.yml --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 60e74d85e..aa51bd285 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -30,7 +30,7 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only way that was not attempted: sid-like calibre-install-unstable.sh). THO NOT BOOTABLE IN Zero W (#952) + command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only way that was not attempted: sid-like calibre-install-unstable.sh). THO NOT BOOTABLE IN Zero W (#952) when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) From 246f33cc66d7c128aa710b07ec031dc0afa4d7c0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 06:57:48 -0400 Subject: [PATCH 08/32] Update debs.yml --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index aa51bd285..23504f511 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -30,7 +30,7 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only way that was not attempted: sid-like calibre-install-unstable.sh). THO NOT BOOTABLE IN Zero W (#952) + command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) From 363ffad15cd5c669821bf95a4a2ea99eacab65fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 07:48:44 -0400 Subject: [PATCH 09/32] Update html.yml --- roles/httpd/tasks/html.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/httpd/tasks/html.yml b/roles/httpd/tasks/html.yml index d6ea61dc3..df00e4266 100644 --- a/roles/httpd/tasks/html.yml +++ b/roles/httpd/tasks/html.yml @@ -1,4 +1,4 @@ -- name: Copy css files +- name: Copy css files to /library/www/html/common/css copy: src: "{{ item }}" dest: "{{ doc_root }}/common/css" @@ -8,7 +8,7 @@ with_fileglob: - html/css/*.css -- name: Copy js files +- name: Copy js files to /library/www/html/common/js copy: src: "{{ item }}" dest: "{{ doc_root }}/common/js" @@ -18,7 +18,7 @@ with_fileglob: - html/js/*.js -- name: Copy fonts files +- name: Copy fonts files to /library/www/html/common/fonts copy: src: "{{ item }}" dest: "{{ doc_root }}/common/fonts" @@ -28,7 +28,7 @@ with_fileglob: - html/fonts/* -- name: Copy html files +- name: Copy html files to /library/www/html/common/html copy: src: "{{ item }}" dest: "{{ doc_root }}/common/html" @@ -38,7 +38,7 @@ with_fileglob: - html/html/* -- name: Copy assets files +- name: Copy assets files to /library/www/html/common/assets copy: src: "{{ item }}" dest: "{{ doc_root }}/common/assets" @@ -49,7 +49,7 @@ - html/assets/* # copy all services, even if not permissioned elsewhere -- name: Copy services files +- name: Copy services files to /library/www/html/common/services copy: src: "{{ item }}" dest: "{{ doc_root }}/common/services" @@ -59,7 +59,7 @@ with_fileglob: - html/services/* -- name: Create symlink from assets to iiab.ini +- name: Create symlink from assets to /etc/iiab/iiab.ini file: src: "/etc/iiab/iiab.ini" dest: "{{ doc_root }}/common/assets/iiab.ini" From 7a1811e1beda74779d3b0939e027b89848f4a6f9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:02:44 -0400 Subject: [PATCH 10/32] Update main.yml --- roles/httpd/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index ba5543dc5..b7a179634 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -31,7 +31,7 @@ - download when: is_ubuntu -- name: Sqlite3 no longer included in another package in ubuntu18 +- name: SQLite3 no longer included in another package (ubuntu-18) package: name: php{{ php_version }}-sqlite3 when: is_ubuntu_18 @@ -65,9 +65,9 @@ group: root mode: "{{ item.mode }}" with_items: - - { src: '010-iiab.conf.j2' , dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' } - - { src: 'proxy_ajp.conf.j2' , dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' } - - { src: 'php.ini.j2' , dest: '/etc/php.ini' , mode: '0644' } + - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' } + - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' } + - { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # remove symlinks for mpm-event, replace with mpm-prefork - name: Remove mpm event links (debuntu) @@ -113,7 +113,7 @@ state: absent when: is_debuntu -- name: Create http pid dir +- name: Create http pid dir /var/run/{{ apache_user }} file: path: "/var/run/{{ apache_user }}" mode: 0755 @@ -126,14 +126,14 @@ name: admin state: present -- name: Add apache user to admin group +- name: Add apache_user {{ apache_user }} to admin group user: name: "{{ apache_user }}" groups: admin state: present createhome: no -- name: Create httpd log dir +- name: Create httpd log dir /var/log/{{ apache_service }} file: path: "/var/log/{{ apache_service }}" mode: 0755 From 7b5e82c4adeb497ab8b2694052fa8fad581d8327 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:25:15 -0400 Subject: [PATCH 11/32] Update main.yml --- roles/httpd/tasks/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index b7a179634..3a99a7585 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -11,13 +11,14 @@ - download when: is_debian -- name: Debian changed sqlite name (debian-8) +- name: Debian changed SQLite name (debian-8) package: name: "php{{ php_version }}-sqlite" when: is_debian and ansible_distribution_major_version == "8" -- name: Debian changed sqlite name (debian-9) - package: name=php{{ php_version }}-sqlite3 +- name: Debian changed SQLite3 name (debian-9) + package: + name: "php{{ php_version }}-sqlite3" when: is_debian and ansible_distribution_major_version == "9" - name: Install httpd required packages (ubuntu) @@ -126,7 +127,7 @@ name: admin state: present -- name: Add apache_user {{ apache_user }} to admin group +- name: Add {{ apache_user }} (from variable apache_user) to admin group user: name: "{{ apache_user }}" groups: admin @@ -180,14 +181,14 @@ dest: /usr/bin/iiab-refresh-wiki-docs mode: 0755 -- name: Give apache_user permission for poweroff +- name: Give apache_user permission to poweroff template: src: 020_apache_poweroff.j2 dest: /etc/sudoers.d/020_apache_poweroff mode: 0755 when: allow_apache_sudo -- name: Remove apache_user permission for poweroff +- name: Remove apache_user permission to poweroff file: dest: /etc/sudoers.d/020_apache_poweroff state: absent From b774a4ea8bfe556ca53ff3a02c3c1dfe7ea0682a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:32:16 -0400 Subject: [PATCH 12/32] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 3a99a7585..7f50dd980 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -108,7 +108,7 @@ - 010-iiab.conf when: is_debuntu -- name: Remove the default site container (debuntu) +- name: Remove the default apache2 config file (debuntu) file: dest: /etc/apache2/000-default.conf state: absent From 203d8b5392dfd708f515f264549bb05d1897c73f Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:40:01 -0400 Subject: [PATCH 13/32] Update main.yml --- roles/httpd/tasks/main.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 7f50dd980..0b0f3ad61 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -51,11 +51,12 @@ - download when: is_redhat -- name: Remove the default apache2 config file (debuntu) - file: - path: /etc/apache2/sites-enabled/000-default.conf - state: absent - when: is_debuntu +# MOVED DOWN ~58 LINES +#- name: Remove the default apache2 config file (debuntu) +# file: +# path: /etc/apache2/sites-enabled/000-default.conf +# state: absent +# when: is_debuntu - name: Create httpd config files template: @@ -108,10 +109,13 @@ - 010-iiab.conf when: is_debuntu -- name: Remove the default apache2 config file (debuntu) +- name: Remove apache2 default config files (debuntu) file: - dest: /etc/apache2/000-default.conf + path: {{ item }} state: absent + with_items: + - /etc/apache2/000-default.conf + - /etc/apache2/sites-enabled/000-default.conf when: is_debuntu - name: Create http pid dir /var/run/{{ apache_user }} From 056d9eb87badb144097ac96cad22981f657e2b85 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:41:02 -0400 Subject: [PATCH 14/32] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 0b0f3ad61..693bedf10 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -111,7 +111,7 @@ - name: Remove apache2 default config files (debuntu) file: - path: {{ item }} + path: "{{ item }}" state: absent with_items: - /etc/apache2/000-default.conf From 291b677c5557f523347df3fa6eb778b7b4151ab8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 08:46:08 -0400 Subject: [PATCH 15/32] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 693bedf10..797cbc05a 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -102,7 +102,7 @@ - name: Create symlinks for enabling our site (debuntu) file: - path: "/etc/apache2/sites-enabled/{{ item }}" + path: "/etc/apache2/sites-enabled/{{ item }}" # Not nec on Raspbian. Is this really still needed elsewhere? src: "/etc/apache2/sites-available/{{ item }}" state: link with_items: From a024f2fe981822b829a73692c40e3e45dca574e5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:16:17 -0400 Subject: [PATCH 16/32] Update local_vars_min.yml --- vars/local_vars_min.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 2a6a7d2f4..1cab29946 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: False phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From a38efb5e2aaba6b09cf6c5f7aef56c5add15a1d9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:16:44 -0400 Subject: [PATCH 17/32] Update local_vars_min_vpn.yml --- vars/local_vars_min_vpn.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_min_vpn.yml b/vars/local_vars_min_vpn.yml index 349513bcf..b65046711 100644 --- a/vars/local_vars_min_vpn.yml +++ b/vars/local_vars_min_vpn.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: False phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From 940e912074d02024add7e37305ef7d97cacd0c07 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:17:12 -0400 Subject: [PATCH 18/32] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 9290dfee8..44395a1b4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: False phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From 26c77b790aa5de907dc1f980c4c6df7dd2eda076 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:17:33 -0400 Subject: [PATCH 19/32] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index 41f30edad..20e4493a0 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: False phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From 0d90485657a4579219df7d9279b0f3c30395e822 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:17:54 -0400 Subject: [PATCH 20/32] Update local_vars_big.yml --- vars/local_vars_big.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 603bd2901..c6337b98f 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: True phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From 53fed734dd4b62944f28c498f813564433b11df8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:19:11 -0400 Subject: [PATCH 21/32] Update local_vars_big_vpn.yml --- vars/local_vars_big_vpn.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big_vpn.yml b/vars/local_vars_big_vpn.yml index 081ea50b5..393e84f86 100644 --- a/vars/local_vars_big_vpn.yml +++ b/vars/local_vars_big_vpn.yml @@ -212,13 +212,13 @@ munin_enabled: True phpmyadmin_install: True phpmyadmin_enabled: False -# Unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - vnstat_install: True vnstat_enabled: True +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) +# teamviewer_install: False +# teamviewer_enabled: False + # Unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From dff3caa286065e5d8d7324df946adb4160658225 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:19:35 -0400 Subject: [PATCH 22/32] Update local_vars_big.yml --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index c6337b98f..3c30426bc 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -215,7 +215,7 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True -# Unmaintained (better to install from http://teamviewer.com) +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From f538b7dd41e75a4a57f41beaf4f056e1a8124e5b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:19:56 -0400 Subject: [PATCH 23/32] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index 20e4493a0..b78bc5f5a 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -215,7 +215,7 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True -# Unmaintained (better to install from http://teamviewer.com) +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From 02cddfaee91293b5c559f01fa5ca7c1c93fe60d6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:20:13 -0400 Subject: [PATCH 24/32] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 44395a1b4..43f17384a 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -215,7 +215,7 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True -# Unmaintained (better to install from http://teamviewer.com) +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From edac067a5dc9d4078e5b9c0411ee27590b60ccfe Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:20:29 -0400 Subject: [PATCH 25/32] Update local_vars_min_vpn.yml --- vars/local_vars_min_vpn.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min_vpn.yml b/vars/local_vars_min_vpn.yml index b65046711..a60ecaaff 100644 --- a/vars/local_vars_min_vpn.yml +++ b/vars/local_vars_min_vpn.yml @@ -215,7 +215,7 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True -# Unmaintained (better to install from http://teamviewer.com) +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From 916581e07844ae6bbf74f6fe4953310a72731d05 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:20:56 -0400 Subject: [PATCH 26/32] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 1cab29946..78e53e111 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -215,7 +215,7 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True -# Unmaintained (better to install from http://teamviewer.com) +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From c86b961e0385d523a642db87ed18285b2ab18f7c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:24:49 -0400 Subject: [PATCH 27/32] Update default_vars.yml --- vars/default_vars.yml | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 245bc85c3..935e2236b 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -380,33 +380,33 @@ munin_enabled: False phpmyadmin_install: False phpmyadmin_enabled: False -# sugar-stats - unmaintained -sugar_stats_install: False -sugar_stats_enabled: False - -# TeamViewer - unmaintained (better to install from http://teamviewer.com) -teamviewer_install: False -teamviewer_enabled: False - # vnStat vnstat_install: True vnstat_enabled: False -# XOVis - unmaintained -xovis_install: False -xovis_enabled: False -xovis_target_host: "127.0.0.1:5984" -xovis_deployment_name: olpc -xovis_db_name: xovis -xovis_db_user: admin -xovis_db_password: admin - -xovis_root: "/opt/xovis" -xovis_backup_dir: "/library/users" -xovis_chart_heading: "My School: Usage Data Visualization" - # ================================================================ +# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) +# teamviewer_install: False +# teamviewer_enabled: False + +# sugar-stats - unmaintained +# sugar_stats_install: False +# sugar_stats_enabled: False + +# XOVis - unmaintained +# xovis_install: False +# xovis_enabled: False +# xovis_target_host: "127.0.0.1:5984" +# xovis_deployment_name: olpc +# xovis_db_name: xovis +# xovis_db_user: admin +# xovis_db_password: admin + +# xovis_root: "/opt/xovis" +# xovis_backup_dir: "/library/users" +# xovis_chart_heading: "My School: Usage Data Visualization" + # Ajenti - unmaintained # ajenti_install: False # ajenti_enabled: False @@ -419,7 +419,8 @@ xovis_chart_heading: "My School: Usage Data Visualization" # rachel_doc_root: "{{ doc_root }}/modules" # ================================================================ -# Platforms - turn all off and let .yml turn on as appropriate + +# Platforms - turn all off and let /opt/iiab/iiab/vars/.yml turn on as appropriate # wide to narrow is_debuntu: False From 579ab8e3396d2b8fe0242f8ceec16b2bc28d0372 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:29:31 -0400 Subject: [PATCH 28/32] Update main.yml --- roles/teamviewer/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/teamviewer/defaults/main.yml b/roles/teamviewer/defaults/main.yml index f66401b80..b3fc48ace 100644 --- a/roles/teamviewer/defaults/main.yml +++ b/roles/teamviewer/defaults/main.yml @@ -1,4 +1,4 @@ teamviewer_url: "{{ iiab_download_url }}" teamviewer_rpm_file: teamviewer_10.0.41499.i686.rpm -teamviewer_install: True +teamviewer_install: False teamviewer_enabled: False From 29399c8db31789413cffc21f2d4afb2f403b8dc1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 11:31:40 -0400 Subject: [PATCH 29/32] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 935e2236b..e7a92d215 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -422,7 +422,7 @@ vnstat_enabled: False # Platforms - turn all off and let /opt/iiab/iiab/vars/.yml turn on as appropriate -# wide to narrow +# Wide to narrow is_debuntu: False is_ubuntu: False is_ubuntu_18: False From f1dea552c44f126dc1239483b87fd455042dd42b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 12:17:30 -0400 Subject: [PATCH 30/32] Update hostapd.service.j2 --- roles/network/templates/hostapd/hostapd.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2 index 09d3862b0..1fec56e5a 100644 --- a/roles/network/templates/hostapd/hostapd.service.j2 +++ b/roles/network/templates/hostapd/hostapd.service.j2 @@ -5,7 +5,7 @@ After=network-online.target [Service] Type=idle PIDFile=/run/hostapd.pid -ExecStart=/usr/sbin/hostapd -P /run/hostapd.pid /etc/hostapd/hostapd.conf +ExecStart=/usr/sbin/hostapd -P /run/hostapd.pid /etc/hostapd/hostapd.conf [Install] WantedBy=multi-user.target From d97f62edf92baa8227c18ae8ddc9c9c9992d563e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 12:45:38 -0400 Subject: [PATCH 31/32] Update main.yml --- roles/network/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 3d2e7ec42..65b956177 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -78,7 +78,7 @@ # set_fact: # py_captive_portal_install: True -- name: (Re)Installing captive portal +- name: (Re)Installing Captive Portal include_tasks: captive_portal.yml when: py_captive_portal_install From 67ea98d354a5a8c80106067b1023ee941822dc41 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Aug 2018 12:48:17 -0400 Subject: [PATCH 32/32] Update main.yml --- roles/8-mgmt-tools/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml index 096f210da..eab0f6180 100644 --- a/roles/8-mgmt-tools/tasks/main.yml +++ b/roles/8-mgmt-tools/tasks/main.yml @@ -30,7 +30,7 @@ - name: SUGAR-STATS include_role: name: sugar-stats - when: 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 - name: TEAMVIEWER @@ -48,7 +48,7 @@ - name: XOVIS include_role: name: xovis - when: xovis_install and ansible_distribution != "CentOS" + when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS" tags: xovis - name: Recording STAGE 8 HAS COMPLETED ======================