Merge pull request #172 from iiab/master

sync from iiab/iiab

iiab-install

@@ -10,7 +10,7 @@ CWD=`pwd`
 OS=`grep ^ID= /etc/*release|cut -d= -f2`
 OS=${OS//\"/}
 MIN_RPI_KERN=4.9.59-v7+
-MIN_ANSIBLE_VER=2.6.4
+MIN_ANSIBLE_VER=2.6.5
 
 if [ ! -f /etc/iiab/local_vars.yml ]; then
 

roles/calibre-web/templates/calibre-web.conf.j2

@@ -1,7 +1,7 @@
-# Used to work (in August 2018) but prevented http://box/books from working (in October 2018, https://github.com/iiab/iiab/issues/1196)
+# Line used to work (in August 2018) but prevented http://box/books from working in October 2018: https://github.com/iiab/iiab/issues/1196
 #<VirtualHost *:80>
 
-# Unnec when "/proxy" is added to Proxy* directives further below
+# Unnec when "{{ calibreweb_url }}" is added to Proxy* directive(s) further below
 #    <Location "{{ calibreweb_url }}" >
 
 RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
@@ -9,10 +9,10 @@ RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
 # Appears unnec:
 RequestHeader set X-SCHEME http
 
-ProxyPass /books http://localhost:{{ calibreweb_port }}/
+ProxyPass {{ calibreweb_url }} http://localhost:{{ calibreweb_port }}/
 
 # Appears unnec:
-ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/
+ProxyPassReverse {{ calibreweb_url }} http://localhost:{{ calibreweb_port }}/
 
 #    </Location>
 

roles/transmission/tasks/main.yml

@@ -43,7 +43,7 @@
     -n {{ transmission_username }}:{{ transmission_password }}
     -a http://pantry.learningequality.org/downloads/ka-lite/{{ transmission_kalite_version }}/content/ka-lite-0.17-resized-videos-{{ item }}.torrent
   with_items: "{{ transmission_kalite_languages }}"
-  when: transmission_enabled and transmission_provision and transmission_kalite_languages is defined
+  when: transmission_enabled and transmission_provision and transmission_kalite_languages is defined and transmission_kalite_languages is not none
   ignore_errors: yes
 
 - name: Disable transmission-daemon service

vars/default_vars.yml

@@ -331,8 +331,8 @@ sugarizer_port: 8089
 # 8-MGMT-TOOLS
 
 # Transmission is a BitTorrent downloader for large Content Packs etc
-transmission_install: False
+transmission_install: True
-transmission_enabled: False
+transmission_enabled: True
 
 # Transmission download directory & general owner/group
 transmission_download_dir: "{{ content_base }}/transmission/"    # /library/transmission/
@@ -350,7 +350,7 @@ transmission_kalite_version: 0.17
 
 # A. Uncomment language(s) in /etc/iiab/local_vars.yml to download KA Lite videos to /library/transmission
 transmission_kalite_languages:
-  - english
+  #- english
   #- french
   #- hindi
   #- portugal-portuguese

vars/local_vars_big.yml

@@ -190,12 +190,12 @@ sugarizer_enabled: True
 # 8-MGMT-TOOLS
 
 # BitTorrent downloader for large Content Packs etc
-transmission_install: False
+transmission_install: True
-transmission_enabled: False
+transmission_enabled: True
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
-  - english
+  #- english
   #- french
   #- hindi
   #- portugal-portuguese

vars/local_vars_medium.yml

@@ -190,12 +190,12 @@ sugarizer_enabled: True
 # 8-MGMT-TOOLS
 
 # BitTorrent downloader for large Content Packs etc
-transmission_install: False
+transmission_install: True
-transmission_enabled: False
+transmission_enabled: True
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
-  - english
+  #- english
   #- french
   #- hindi
   #- portugal-portuguese

vars/local_vars_min.yml

@@ -195,7 +195,7 @@ transmission_enabled: False
 # A. Uncomment language(s) to download KA Lite videos to /library/transmission
 #    using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_kalite_languages:
-  - english
+  #- english
   #- french
   #- hindi
   #- portugal-portuguese