From 26e4b768b086e3f8edf83d7f54e9088bf427badc Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:23:39 -0400 Subject: [PATCH 1/8] Update main.yml --- roles/transmission/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml index 0ee97e234..2836816dc 100644 --- a/roles/transmission/tasks/main.yml +++ b/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 From 0435a019c140672089cd1f0364749287809f6010 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:44:59 -0400 Subject: [PATCH 2/8] 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 1c87d0a67..0691ef287 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -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 From 4ca450e5ce9889a90578e8969f29855740774bb9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:45:51 -0400 Subject: [PATCH 3/8] Update default_vars.yml --- vars/default_vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 0691ef287..e2912ecef 100644 --- a/vars/default_vars.yml +++ b/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_enabled: False +transmission_install: True +transmission_enabled: True # Transmission download directory & general owner/group transmission_download_dir: "{{ content_base }}/transmission/" # /library/transmission/ From 6ce4d72ec870b92a8d6a45bf1edfa87c18c64726 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:46:47 -0400 Subject: [PATCH 4/8] 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 2e1028d4a..46b500224 100644 --- a/vars/local_vars_min.yml +++ b/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 From 7648fdc3bd266888b775fd4803ba1706ea61511b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:47:16 -0400 Subject: [PATCH 5/8] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index c69892b97..42d98329d 100644 --- a/vars/local_vars_medium.yml +++ b/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_enabled: False +transmission_install: True +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 From 3ff0b61cd8da8cc59dc5442abbad8cd64aec8307 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 20:49:03 -0400 Subject: [PATCH 6/8] Update local_vars_big.yml --- vars/local_vars_big.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 7e7393b88..a8b9194d1 100644 --- a/vars/local_vars_big.yml +++ b/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_enabled: False +transmission_install: True +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 From ccbee28746a4c46d66525cc8aae8fa99fcc34a08 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 22:05:48 -0400 Subject: [PATCH 7/8] Update calibre-web.conf.j2 --- roles/calibre-web/templates/calibre-web.conf.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2 index a5efcabe9..052cc66ce 100644 --- a/roles/calibre-web/templates/calibre-web.conf.j2 +++ b/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 # -# Unnec when "/proxy" is added to Proxy* directives further below +# Unnec when "{{ calibreweb_url }}" is added to Proxy* directive(s) further below # 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 }}/ # From d14bec39a53ec81ebaf39a7e97e6003ede824c99 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 14 Oct 2018 12:42:38 -0400 Subject: [PATCH 8/8] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index c9c66bbb5..c019d4a8b 100755 --- a/iiab-install +++ b/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