Merge pull request #164 from iiab/master

sync from iiab/iiab

roles/calibre/defaults/main.yml

@@ -19,11 +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 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_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: "{{ 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

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)

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/<OS>.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

scripts/docs_ignore

@@ -0,0 +1,11 @@
+authserver
+debian_schooltool
+ejabberd_xs
+idmgr
+ajenti
+moodle-1.9
+pathagar
+schooltool
+nodogsplash
+docker
+sugar-stats

scripts/roles_needing_docs.py

@@ -0,0 +1,27 @@
+#!/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 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
+from os.path import join as make_path
+from glob import 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)