external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1697 from holta/ubuntu-18-19-20

Browse source 
Not just is_ubuntu_18: make U19/U20 viable [Debian 10 already OK?] [extends use of php{{ php_version }}-sqlite3 to future OS's for now...somewhat controversially]
This commit is contained in:
A Holt 2019-05-30 21:17:47 -04:00 committed by GitHub
commit 43a245e3d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
roles/calibre/tasks/debs.yml
View file

@ -1,9 +1,12 @@
# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before
# calling this script. As of 2018-10-23 this is set in only 3 places:
# calibre_via_debs MUST BE TRUE IN ORDER FOR roles/calibre/tasks/main.yml TO
# INVOKE THIS SCRIPT. As of 2019-05-30, that means these 4 OS's:
#
# vars/raspbian-9.yml
# vars/raspbian-8.yml
# vars/debian-10.yml
# /opt/iiab/iiab/vars/raspbian-8.yml
# /opt/iiab/iiab/vars/raspbian-9.yml
# /opt/iiab/iiab/vars/raspbian-10.yml
# /opt/iiab/iiab/vars/debian-10.yml
#
# As viewable live @ https://github.com/iiab/iiab/tree/master/vars
# If you want the latest Calibre, run the appropriate script below, standalone.
# HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!) to
@ -44,9 +47,11 @@
# command: scripts/calibre-install-pinned-rpi.sh # Worked for Calibre 3.33.1 on 2018-10-23, e.g. so IIAB microSD bootable in RPi Zero W
# when: is_rpi and internet_available
- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
- name: Install/Upgrade to Calibre testing .deb's (not rpi)
command: scripts/calibre-install-latest.sh
when: not is_rpi and not is_ubuntu_18 and internet_available
when: (not is_rpi) and internet_available
#when: (not is_rpi) and (is_debian_9 or is_ubuntu_16) and internet_available
#when: not is_rpi and not is_ubuntu_18 and internet_available
- name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs
command: scripts/calibre-install-unstable.sh

27
roles/httpd/tasks/main.yml
View file

@ -23,16 +23,29 @@
tags:
- download
- name: Install php{{ php_version }}-sqlite (debian-8)
package:
name: "php{{ php_version }}-sqlite"
when: is_debian and ansible_distribution_major_version == "8"
# 2019-05-30: Irrelevant (never invoked)
#- name: Install php{{ php_version }}-sqlite (raspbian-8 or debian-8)
# package:
# name: "php{{ php_version }}-sqlite"
# when: is_raspbian_8 or is_debian_8
# #when: is_debian and ansible_distribution_major_version == "8"
# SQLite3 no longer included in another package
- name: Install php{{ php_version }}-sqlite3 (debian-9 or ubuntu-18)
# 2019-05-30: It's interesting that http://box.lan/admin and everything seems
# to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu
# 16.04 (SEE PR #1697). And likely all others? @tim-moody writes "I think
# we decided that because sqlite3 and php are part of the base install the
# connector should be too."
# We might *try* deprecating this here as we transition beyond {raspbian-9,
# debian-9, ubuntu-18} in coming months to verify that roles/osm-vector-maps
# is the only role that needs it?
#
# Legacy Comment: SQLite3 no longer included in another package
- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+)
package:
name: "php{{ php_version }}-sqlite3"
when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
#when: is_raspbian_9 or is_debian_9 or is_ubuntu_18
when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16)
#when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
- name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)'
package: