From 91f04d446c089073692ab7269e58f16fd762d9ff Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:06:07 -0400 Subject: [PATCH 01/15] Update main.yml --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index ac64a8165..e7b1de7eb 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,9 +21,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all.deb (25M, 2018-09-07) -# calibre-bin_3.31.0+dfsg-1_armhf.deb (747K, 2018-09-12) -calibre_deb_pin_version: 3.31.0+dfsg-1 +# calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) ...SEE ALSO 706K calibre-bin_3.32.0+dfsg-1+b1_armhf.deb ? +calibre_deb_pin_version: 3.32.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 63cae9565dcfb6c160e6694bc54fcd9546ea1d41 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:14:04 -0400 Subject: [PATCH 02/15] Update main.yml --- roles/calibre/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index e7b1de7eb..852a22b88 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -22,8 +22,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) -# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) ...SEE ALSO 706K calibre-bin_3.32.0+dfsg-1+b1_armhf.deb ? +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? calibre_deb_pin_version: 3.32.0+dfsg-1 +calibre-bin_deb_pin_version: 3.32.0+dfsg-1+b1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From a6f5d5876332f1940cde9a476ecc80943c172029 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:14:35 -0400 Subject: [PATCH 03/15] 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 e00b46e0b..a37278f79 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -43,7 +43,7 @@ timeout: "{{ download_timeout }}" with_items: - calibre_{{ calibre_deb_pin_version }}_all.deb - - calibre-bin_{{ calibre_deb_pin_version }}_armhf.deb + - calibre-bin_{{ calibre-bin_deb_pin_version }}_armhf.deb when: is_rpi and internet_available - name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) From c3153e06cc1de66ce0ae9574c3c6db84fddcf55c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:22:42 -0400 Subject: [PATCH 04/15] Update main.yml --- roles/calibre/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 852a22b88..4035f1860 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -24,7 +24,7 @@ calibre_deb_url: http://download.iiab.io/packages # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) # calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? calibre_deb_pin_version: 3.32.0+dfsg-1 -calibre-bin_deb_pin_version: 3.32.0+dfsg-1+b1 +calibre_bin_deb_pin_version: 3.32.0+dfsg-1+b1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 6b786dcfdb618d2fefb46d29f69c81e7f1acae62 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:23:00 -0400 Subject: [PATCH 05/15] 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 a37278f79..6638bd29a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -43,7 +43,7 @@ timeout: "{{ download_timeout }}" with_items: - calibre_{{ calibre_deb_pin_version }}_all.deb - - calibre-bin_{{ calibre-bin_deb_pin_version }}_armhf.deb + - calibre-bin_{{ calibre_bin_deb_pin_version }}_armhf.deb when: is_rpi and internet_available - name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) From 0d33d7aef019d3baecdc5f526d1596933d05594e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:27:25 -0400 Subject: [PATCH 06/15] Update main.yml --- roles/network/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 44ffb7c1a..017a268f0 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -65,8 +65,8 @@ services_externally_visible: False # DNS / name resolution dhcpd_install: True dhcpd_enabled: True -#dhcp_service: ???? # Appears nec for roles/network/tasks/dhcpd.yml ? -dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 as required by roles/network/tasks/computed_services.yml ? +#dhcp_service: ???? # Set in individual OS's /opt/iiab/iiab/vars/.yml for use in roles/network/tasks/dhcpd.yml +dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 during transition from named to dnsmasq, as required by roles/network/tasks/computed_services.yml named_install: True named_enabled: False dnsmasq_enabled: True From 06e7fcfdccdf7317db86a75efb8ae6ccc3416827 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:48:40 -0400 Subject: [PATCH 07/15] Update main.yml --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 4035f1860..7207cf670 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -20,11 +20,11 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" calibre_deb_url: http://download.iiab.io/packages -# Must contain both packages for the pinned version, formatted as follows: +# Must contain both packages, corresponding with variable value(s) below, for scripts/calibre-install-pinned-rpi.sh to run: # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) -# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) WORKS DESPITE BEING 11H EARLIER? FAILS: calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) calibre_deb_pin_version: 3.32.0+dfsg-1 -calibre_bin_deb_pin_version: 3.32.0+dfsg-1+b1 +calibre_bin_deb_pin_version: 3.32.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From a7eb43309cac504aa4c21ee33b02b2b652d12044 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 9 Oct 2018 00:07:20 -0400 Subject: [PATCH 08/15] Update main.yml --- roles/calibre/defaults/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 7207cf670..92bda38dc 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,12 +19,14 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" -calibre_deb_url: http://download.iiab.io/packages -# Must contain both packages, corresponding with variable value(s) below, for scripts/calibre-install-pinned-rpi.sh to run: -# calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) -# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) WORKS DESPITE BEING 11H EARLIER? FAILS: calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) +calibre_deb_url: {{ iiab_download_url }} # http://download.iiab.io/packages +# Above URL must offer both .deb files below, corresponding with variable +# value(s) further below: (for scripts/calibre-install-pinned-rpi.sh to run) +# - calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) +# - calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) WORKS DESPITE BEING +# PUBLISHED 11+ HRS BEFORE NON-WORKING calibre-bin_3.32.0+dfsg-1+b1_armhf.deb calibre_deb_pin_version: 3.32.0+dfsg-1 -calibre_bin_deb_pin_version: 3.32.0+dfsg-1 +calibre_bin_deb_pin_version: "{{ calibre_deb_pin_version }}" # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 1269437b6fc39d0a199d8503051087d3c42f6630 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 9 Oct 2018 09:06:05 -0400 Subject: [PATCH 09/15] Delete .iiab.env.j2.un~ --- roles/1-prep/templates/.iiab.env.j2.un~ | Bin 1976 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 roles/1-prep/templates/.iiab.env.j2.un~ diff --git a/roles/1-prep/templates/.iiab.env.j2.un~ b/roles/1-prep/templates/.iiab.env.j2.un~ deleted file mode 100644 index 870f3493ea3ab732ed83e397a812081888117b83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1976 zcmWH`%$*;a=aT=Ff$7UHmZ#g|idc6TgjV#iMfmwmzfmu)w&u8m|Ed3G<|Td%3=F(L z3<5Bk5y)l%i$G`)8_bX1)abwhl4WLyzW`Oh1f@X~NQx82{|^LU5tzUzOIdSu*j867WEPYpCgr3S$Cnf(7R0CKfjB7&wY5M^dUgvO(d{jp%opyDc=N~ zNSGjr1RnH23qetXDartiI8a1^vpq-^5HJHVsE7cYFdA{7AfY7y7PjW#h{F;^pokN3 z3v}@V=h)1|B;B;alssTAg+?7Hs*nLF8b_lJIYem621cDdw4MYP%; Date: Tue, 9 Oct 2018 11:32:26 -0400 Subject: [PATCH 10/15] Update main.yml --- roles/calibre/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 92bda38dc..96287ea62 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,7 +19,7 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" -calibre_deb_url: {{ iiab_download_url }} # http://download.iiab.io/packages +calibre_deb_url: "{{ iiab_download_url }}" # http://download.iiab.io/packages # Above URL must offer both .deb files below, corresponding with variable # value(s) further below: (for scripts/calibre-install-pinned-rpi.sh to run) # - calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) From 6a046ed7891310cfdf0e6daaed2f677e0e361404 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Tue, 9 Oct 2018 12:19:30 -0400 Subject: [PATCH 11/15] Create script to check roles for missing documentation --- tests/check_role_docs.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 tests/check_role_docs.py diff --git a/tests/check_role_docs.py b/tests/check_role_docs.py new file mode 100755 index 000000000..da0bbd62e --- /dev/null +++ b/tests/check_role_docs.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 + +''' +This script checks every role in the project and prints its name to stdout if +the role directory does not contain a README file. + +For ease of use, you can pipe the output of this script to a file or to a +clipboard utility (e.g. pbcopy on macOS, xclip on Linux). +''' + +import os, glob + +for role in os.listdir("roles"): + readme_glob = os.path.join("roles", role, "README.*") + if not glob.glob(readme_glob): + print(role) From 2df99382a8a8656c95350f9084ce28d2f8e5edc5 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Tue, 9 Oct 2018 12:42:37 -0400 Subject: [PATCH 12/15] Move to scripts/ --- {tests => scripts}/check_role_docs.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {tests => scripts}/check_role_docs.py (100%) diff --git a/tests/check_role_docs.py b/scripts/check_role_docs.py similarity index 100% rename from tests/check_role_docs.py rename to scripts/check_role_docs.py From 2c3470d740f8be36aaf96ea674c907dca46df19e Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Tue, 9 Oct 2018 12:47:31 -0400 Subject: [PATCH 13/15] Sort roles alphabetically --- scripts/check_role_docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_role_docs.py b/scripts/check_role_docs.py index da0bbd62e..a7deb9c19 100755 --- a/scripts/check_role_docs.py +++ b/scripts/check_role_docs.py @@ -10,7 +10,7 @@ clipboard utility (e.g. pbcopy on macOS, xclip on Linux). import os, glob -for role in os.listdir("roles"): +for role in sorted(os.listdir("roles")): readme_glob = os.path.join("roles", role, "README.*") if not glob.glob(readme_glob): print(role) From 41e78d90acae90ec2559a426bf9db61f8dbf2f37 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Tue, 9 Oct 2018 13:16:45 -0400 Subject: [PATCH 14/15] Add support for excluded roles --- scripts/check_role_docs.py | 21 ++++++++++++++++----- scripts/docs_ignore | 11 +++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 scripts/docs_ignore diff --git a/scripts/check_role_docs.py b/scripts/check_role_docs.py index a7deb9c19..5a814bb94 100755 --- a/scripts/check_role_docs.py +++ b/scripts/check_role_docs.py @@ -2,15 +2,26 @@ ''' This script checks every role in the project and prints its name to stdout if -the role directory does not contain a README file. +the role directory does not contain a README file and it is not listed in +scripts/docs_ignore. For ease of use, you can pipe the output of this script to a file or to a clipboard utility (e.g. pbcopy on macOS, xclip on Linux). ''' -import os, glob +import os +from os.path import join as make_path +from glob import glob -for role in sorted(os.listdir("roles")): - readme_glob = os.path.join("roles", role, "README.*") - if not glob.glob(readme_glob): +def included_roles(): + all_roles = set(os.listdir("roles")) + excluded_roles = \ + map(str.rstrip, open(make_path("scripts", "docs_ignore"))) + included_roles = list(all_roles.difference(excluded_roles)) + included_roles.sort() + return included_roles + +for role in included_roles(): + readme = make_path("roles", role, "README.*") + if not glob(readme): print(role) diff --git a/scripts/docs_ignore b/scripts/docs_ignore new file mode 100644 index 000000000..d41d794ad --- /dev/null +++ b/scripts/docs_ignore @@ -0,0 +1,11 @@ +authserver +debian_schooltool +ejabberd_xs +idmgr +ajenti +moodle-1.9 +pathagar +schooltool +nodogsplash +docker +sugar-stats From 10c80f8ac19beb71e618cacff13ec53c2afccbd1 Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Tue, 9 Oct 2018 13:17:18 -0400 Subject: [PATCH 15/15] Rename to roles_needing_docs.py --- scripts/{check_role_docs.py => roles_needing_docs.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{check_role_docs.py => roles_needing_docs.py} (100%) diff --git a/scripts/check_role_docs.py b/scripts/roles_needing_docs.py similarity index 100% rename from scripts/check_role_docs.py rename to scripts/roles_needing_docs.py