external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #347 from iiab/master

Browse source 
sync from iiab:master
This commit is contained in:
A Holt 2020-01-21 16:57:49 -05:00 • committed by GitHub
commit 12808fe635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/calibre-web/defaults/main.yml
View file

@ -14,7 +14,7 @@
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
calibreweb_version: master # WAS: master, 0.6.4 calibreweb_version: 0.6.5 # WAS: master, 0.6.4
calibreweb_venv_path: /usr/local/calibre-web calibreweb_venv_path: /usr/local/calibre-web
calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py" calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"

9
roles/kalite/tasks/install.yml
View file

@ -6,10 +6,11 @@
timeout: "{{ download_timeout }}" timeout: "{{ download_timeout }}"
when: internet_available | bool when: internet_available | bool
- name: Run 'mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139' as "TEMPORARY" workaround (2020-01-17) for piwheels.org's setuptools Python 2/3 brokenness on RPi (https://github.com/iiab/iiab/issues/2139) # 2020-01-19: https://github.com/piwheels/packages/issues/74 says the following is not longer needed...
command: mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139 #- name: Run 'mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139' as "TEMPORARY" workaround (2020-01-17) for piwheels.org's setuptools Python 2/3 brokenness on RPi (https://github.com/iiab/iiab/issues/2139)
ignore_errors: yes # command: mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139
when: is_rpi | bool # ignore_errors: yes
# when: is_rpi | bool
#- name: Install KA Lite non-static + reqs file with pip - (debuntu) #- name: Install KA Lite non-static + reqs file with pip - (debuntu)
# pip: requirements={{ pip_packages_dir }}/kalite.txt # pip: requirements={{ pip_packages_dir }}/kalite.txt

2
roles/lokole/defaults/main.yml
View file

@ -5,7 +5,7 @@
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
# Info needed to install Lokole # Info needed to install Lokole
lokole_version: 0.5.4 lokole_version: 0.5.5
lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!) lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!)
lokole_admin_password: changeme lokole_admin_password: changeme
lokole_install_path: "{{ content_base }}/lokole" # /library/lokole lokole_install_path: "{{ content_base }}/lokole" # /library/lokole

2
scripts/ansible
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CURR_VER="undefined" # Ansible version you currently have installed CURR_VER="undefined" # Ansible version you currently have installed
GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) GOOD_VER="2.9.4" # For XO laptops (pip install) & CentOS (yum install rpm)
# On other OS's we attempt the latest from PPA, which might be more recent # On other OS's we attempt the latest from PPA, which might be more recent
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive

2
scripts/ansible-2.9.x
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CURR_VER="undefined" # Ansible version you currently have installed CURR_VER="undefined" # Ansible version you currently have installed
GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) GOOD_VER="2.9.4" # For XO laptops (pip install) & CentOS (yum install rpm)
# On other OS's we attempt the latest from PPA, which might be more recent # On other OS's we attempt the latest from PPA, which might be more recent
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive