Merge pull request #136 from iiab/master

sync from iiab/iiab

roles/calibre-web/README.rst

@@ -2,25 +2,29 @@
 Calibre-Web README
 ==================
 
-Calibre-Web server provides a clean interface for browsing, reading and
+Calibre-Web provides a clean interface for browsing, reading and downloading
-downloading e-books using an existing Calibre database.
+e-books using an existing Calibre database.  Teachers can add upload e-books,
+adjust e-book metadata, and create custom book collections ("bookshelves"):
+https://github.com/janeczku/calibre-web#about
 
-This Ansible role installs Calibre-Web in Internet-in-a-Box (we'll call it
+This Ansible role installs Calibre-Web as part of your Internet-in-a-Box, as a
-'calibre-web' from here on down, noting that ``calibreweb_*`` variables do not
+possible alternative to Calibre (we'll call it 'calibre-web' from here down,
-include the dash, per Ansible recommendations.)
+noting that ``calibreweb_*`` variables do not include the dash, per Ansible
+recommendations).
 
-Access
+Using It
-------
+--------
 
-After installation you can access calibre-web at http://box/books
+After installation, try out calibre-web at http://box/books (or box.lan/books).
 
-Log in with administrative account::
+Typically students access it without a password (to read and download books)
+whereas teachers add books using an administrative account, as follows::
 
   Username: Admin
   Password: changeme
 
-If the default configuration is not found, calibre-web server creates a
+If the default configuration is not found, the calibre-web server creates a
-new settings file with calibre-web's own default administrative account::
+new settings file with calibre-web's own administrative account default::
 
   Username: admin
   Password: admin123
@@ -28,7 +32,7 @@ new settings file with calibre-web's own default administrative account::
 Backend
 -------
 
-You can manage the backend calibre-web server manually with these commands::
+You can manage the backend calibre-web server with these systemd commands::
 
   systemctl enable calibre-web
   systemctl restart calibre-web
@@ -38,8 +42,8 @@ You can manage the backend calibre-web server manually with these commands::
 Configuration
 -------------
 
-To configure calibre-web, login as user 'Admin' then click on 'Admin' panel on
+To configure calibre-web, login as user 'Admin' then click 'Admin' on top.
-top.  See 'Configuration' options near the bottom of the page.
+Check 'Configuration' options near the bottom of the page.
 
 Critical settings are stored in::
 
@@ -67,7 +71,7 @@ Reinstalling calibre-web automatically upgrades to the latest version.
 Back up your content **and** settings before reinstalling, as explained above.
 
 **Move your /library/calibre-web/metadata.db if you're sure you want to install
-a bare/minimal metadata.db and force default settings.  Then run**::
+a bare/minimal metadata.db and force all settings to the default.  Then run**::
 
   cd /opt/iiab/iiab
   ./runrole calibre-web
@@ -89,6 +93,10 @@ Known Issues
 * Trying to access an empty public bookshelf causes a system error.
 
 * As of August 2018, calibre-web doesn't yet include Calibre's e-book
-  conversion functionality (Calibre 3.27.1 [released 2018-07-06] allows
+  conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows
   teachers to convert between PDF, epub, txt etc — to permit reading on a wider
   array client devices and client software).
+
+* calibre-web does not currently use version numbers, so glitches might
+  occasionally arise using its master branch.  Please assist us in reporting
+  issues here, if they do arise: https://github.com/janeczku/calibre-web/issues

roles/kalite/tasks/setup.yml

@@ -12,5 +12,5 @@
   command: "{{ kalite_program }} manage setup --username={{ kalite_admin_user }} --password={{ kalite_admin_password }} --noinput"
   environment:
     KALITE_HOME: "{{ kalite_root }}"
-  async: 900
+  async: 1800
   poll: 10

roles/nextcloud/tasks/main.yml

@@ -21,8 +21,8 @@
     #validate_certs: False    # TEMPORARY ON/AFTER 2018-07-22 AS download.nextcloud.com CERT EXPIRED: https://github.com/iiab/iiab/issues/954
     timeout: "{{ download_timeout }}"
   when: internet_available and nextcloud_force_install
-  async: 900
+  async: 1800
-  poll: 15
+  poll: 10
   tags:
     - download