Merge pull request #171 from iiab/master

sync from iiab/iiab

.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:

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:
@@ -43,8 +43,8 @@
     -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
   ignore_errors: yes
-  when: transmission_provision
 
 - name: Disable transmission-daemon service
   systemd:

vars/default_vars.yml

@@ -402,17 +402,18 @@ 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
 # vars/<most-OS's>.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
+# 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!)

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/<most-OS's>.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!)

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/<most-OS's>.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!)

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/<most-OS's>.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!)