From 26a9120f9caa6ac1bd44101118f5594aff496bdd Mon Sep 17 00:00:00 2001 From: Arky Date: Tue, 9 Oct 2018 22:38:16 +0700 Subject: [PATCH 01/10] Check if transmission_kalite_languages is defined Checks if any languages are defined in transmission_kalite_languages. Proposed fix for bug #1193. https://github.com/iiab/iiab/issues/1193 --- roles/transmission/tasks/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml index 6eca4c49c..8753964a0 100644 --- a/roles/transmission/tasks/main.yml +++ b/roles/transmission/tasks/main.yml @@ -18,7 +18,7 @@ systemd: name: transmission-daemon state: stopped - ignore_errors: yes + ignore_errors: yes - name: Create transmission-daemon settings template: @@ -42,9 +42,8 @@ --start-paused -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 }}" + with_items: "{{ transmission_kalite_languages | default('english') }}" ignore_errors: yes - when: transmission_provision - name: Disable transmission-daemon service systemd: From 0d2a9bf632fe647ee05021defd77098c281c4b15 Mon Sep 17 00:00:00 2001 From: Arky Date: Fri, 12 Oct 2018 01:43:30 +0700 Subject: [PATCH 02/10] Add local_tmp permissions for TravisCI builds Quick fix for the TravisCI build errors. Build failing: Permission denied when running Ansible #1212 --- .travis.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa673617d..f62a2649f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,27 +3,22 @@ language: python python: "2.7" # Use the new container infrastructure +dist: trusty sudo: false -# Install ansible -addons: - apt: - packages: - - python-pip - install: # Install ansible, ansible-lint and ansible-review - pip install ansible - pip install ansible-review + # Create ansible.cfg with correct roles_path and local_tmp + - "{ echo '[defaults]'; echo 'roles_path = ../'; echo 'local_tmp = ~/.ansible/tmp'; } >> ansible.cfg" + # Check ansible, version - ansible --version - ansible-lint --version - ansible-review --version - # Create ansible.cfg with correct roles_path - - printf '[defaults]\nroles_path=../' >ansible.cfg - script: # Continuous integration: syntax check - ansible-playbook tests/test.yml -i tests/inventory --syntax-check -vvv @@ -32,10 +27,10 @@ script: - ansible-lint -p *yml # Continous integration: ansible code review - - git ls-files *yml roles/ vars/ tests/ | xargs ansible-review + #- git ls-files *yml roles/ vars/ tests/ | xargs ansible-review # Continouse integration: ansible code review of changes between master and current branch - - git diff master | ansible-review + #- git diff master | ansible-review #notifications: From 59f3b88cfc717871dd7eed97f8ca80318a2d4453 Mon Sep 17 00:00:00 2001 From: Arky Date: Sat, 13 Oct 2018 21:40:50 +0700 Subject: [PATCH 03/10] Using 'is defined' over default filters --- roles/transmission/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml index 8753964a0..eac8b12cf 100644 --- a/roles/transmission/tasks/main.yml +++ b/roles/transmission/tasks/main.yml @@ -42,7 +42,8 @@ --start-paused -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 | default('english') }}" + with_items: "{{ transmission_kalite_languages }}" + when: transmission_kalite_languages is defined and transmission_provision ignore_errors: yes - name: Disable transmission-daemon service From 9d937ee276315137a4725f2299180b9333422706 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 13:49:54 -0400 Subject: [PATCH 04/10] 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 06ebea839..596bd72e4 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -402,8 +402,8 @@ vnstat_enabled: False # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. -calibre_install: True -calibre_enabled: True +calibre_install: False +calibre_enabled: False # vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default: calibre_via_debs: False calibre_unstable_debs: False From d28af142a0a88ee56395b8b7ea041b26c6667259 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 13:52:07 -0400 Subject: [PATCH 05/10] 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 596bd72e4..d9f82c72e 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -409,7 +409,7 @@ calibre_via_debs: False calibre_unstable_debs: False # vars/.yml use Calibre's python installer/upgrader (x86_64), overriding this default: calibre_via_python: False -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr ? calibre_port: 8080 # Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 From 84736c759d2b11ea1f1d59a6281579b6d3ee2822 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 13:59:37 -0400 Subject: [PATCH 06/10] Update default_vars.yml --- vars/default_vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index d9f82c72e..1c87d0a67 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -413,6 +413,7 @@ calibre_via_python: False calibre_port: 8080 # Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 +# Avoid collisions with calibreweb_url: below! # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert # program, so we recommend you also install Calibre (above!) From 3ce74bd5b68fec41bb65c7af9e9dde7eb8098938 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 14:00:27 -0400 Subject: [PATCH 07/10] Update local_vars_min.yml --- vars/local_vars_min.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index b48d9a460..2e1028d4a 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -234,16 +234,11 @@ vnstat_enabled: True # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. calibre_install: False calibre_enabled: False -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr ? calibre_port: 8080 # Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv +# Avoid collisions with calibreweb_url: below! # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert # program, so we recommend you also install Calibre (above!) From 96a3f678ff6fd35207922f8feb09453cb9bbd233 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 14:00:41 -0400 Subject: [PATCH 08/10] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 4cc70fd06..c69892b97 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -232,18 +232,13 @@ vnstat_enabled: True # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. -calibre_install: True -calibre_enabled: True -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_install: False +calibre_enabled: False +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr ? calibre_port: 8080 # Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv +# Avoid collisions with calibreweb_url: below! # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert # program, so we recommend you also install Calibre (above!) From 6bc7c692989e225f60d018d1bf50a14b8f1611c9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 14:01:04 -0400 Subject: [PATCH 09/10] Update local_vars_big.yml --- vars/local_vars_big.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index ec2e751dd..7e7393b88 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -232,18 +232,13 @@ vnstat_enabled: True # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. -calibre_install: True -calibre_enabled: True -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_install: False +calibre_enabled: False +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr ? calibre_port: 8080 # Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv +# Avoid collisions with calibreweb_url: below! # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert # program, so we recommend you also install Calibre (above!) From ae8b9d93eda8aa453ae6ff4247a7605d2ad03646 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 13 Oct 2018 15:46:44 -0400 Subject: [PATCH 10/10] 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 eac8b12cf..0ee97e234 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_kalite_languages is defined and transmission_provision + when: transmission_enabled and transmission_provision and transmission_kalite_languages is defined ignore_errors: yes - name: Disable transmission-daemon service